Commit 47dbabb8 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman

scsi: return correct blkprep status code in case scsi_init_io() fails.

commit e7661a8e upstream.

When instrumenting the SCSI layer to run into the
!blk_rq_nr_phys_segments(rq) case the following warning emitted from the
block layer:

blk_peek_request: bad return=-22

This happens because since commit fd3fc0b4 ("scsi: don't BUG_ON()
empty DMA transfers") we return the wrong error value from
scsi_prep_fn() back to the block layer.

[mkp: silenced checkpatch]
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Fixes: fd3fc0b4 scsi: don't BUG_ON() empty DMA transfers
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dcb730f7
...@@ -1038,10 +1038,10 @@ int scsi_init_io(struct scsi_cmnd *cmd) ...@@ -1038,10 +1038,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
struct scsi_device *sdev = cmd->device; struct scsi_device *sdev = cmd->device;
struct request *rq = cmd->request; struct request *rq = cmd->request;
bool is_mq = (rq->mq_ctx != NULL); bool is_mq = (rq->mq_ctx != NULL);
int error; int error = BLKPREP_KILL;
if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq))) if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
return -EINVAL; goto err_exit;
error = scsi_init_sgtable(rq, &cmd->sdb); error = scsi_init_sgtable(rq, &cmd->sdb);
if (error) if (error)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment