vhost scsi: add lun parser helper (18f1becb) · Commits · 戴 / test

Move code to parse lun from req's lun_buf to helper, so tmf code can use it in the next patch. Signed-off-by:

drivers/vhost/scsi.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -898,6 +898,11 @@ vhost_scsi_get_req(struct vhost_virtqueue vq, struct vhost_scsi_ctx vc,
		return ret;
		}

		static u16 vhost_buf_to_lun(u8 *lun_buf)
		{
		return ((lun_buf[2] << 8) \| lun_buf[3]) & 0x3FFF;
		}

		static void
		vhost_scsi_handle_vq(struct vhost_scsi vs, struct vhost_virtqueue vq)
		{
		@@ -1036,12 +1041,12 @@ vhost_scsi_handle_vq(struct vhost_scsi vs, struct vhost_virtqueue vq)
		tag = vhost64_to_cpu(vq, v_req_pi.tag);
		task_attr = v_req_pi.task_attr;
		cdb = &v_req_pi.cdb[0];
		lun = ((v_req_pi.lun[2] << 8) \| v_req_pi.lun[3]) & 0x3FFF;
		lun = vhost_buf_to_lun(v_req_pi.lun);
		} else {
		tag = vhost64_to_cpu(vq, v_req.tag);
		task_attr = v_req.task_attr;
		cdb = &v_req.cdb[0];
		lun = ((v_req.lun[2] << 8) \| v_req.lun[3]) & 0x3FFF;
		lun = vhost_buf_to_lun(v_req.lun);
		}
		/*
		* Check that the received CDB size does not exceeded our