On 21/09/20 20:23, Mike Christie wrote:> 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: Mike Christie <michael.christie at oracle.com>
> ---
> drivers/vhost/scsi.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index 26d0f75..736ce19 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -899,6 +899,11 @@ static void vhost_scsi_submission_work(struct
work_struct *work)
> 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)
> {
> @@ -1037,12 +1042,12 @@ static void vhost_scsi_submission_work(struct
work_struct *work)
> 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
>
Reviewed-by: Paolo Bonzini <pbonzini at redhat.com>
