]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
scsi: return correct blkprep status code in case scsi_init_io() fails.
authorJohannes Thumshirn <jthumshirn@suse.de>
Wed, 12 Apr 2017 07:21:19 +0000 (09:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 May 2017 15:37:42 +0000 (08:37 -0700)
commit47dbabb85ef762bbd0be73800d0f167e27fd5ac4
treed45bb69e9fd3b42d55c30e2fd3c445762e317066
parentdcb730f79d3329cdb5a80f3633ec9903af91a533
scsi: return correct blkprep status code in case scsi_init_io() fails.

commit e7661a8e5ce10b5321882d0bbaf3f81070903319 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 fd3fc0b4d730 ("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: Johannes Thumshirn <jthumshirn@suse.de>
Fixes: fd3fc0b4d730 scsi: don't BUG_ON() empty DMA transfers
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/scsi_lib.c