Commit 8f9cedc7 authored Apr 24, 2017 by Linus Torvalds

scsi

Pull SCSI fix from James Bottomley:
 "Our final fix before the 4.12 release (hopefully).

  It's an error leg again: the fix to not bug on empty DMA transfers is
  returning the wrong code and confusing the block layer"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: return correct blkprep status code in case scsi_init_io() fails.

parents 3d339d33 ca855a5e

drivers/scsi/scsi_lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1061,10 +1061,10 @@ int scsi_init_io(struct scsi_cmnd *cmd)
		struct scsi_device *sdev = cmd->device;
		struct request *rq = cmd->request;
		bool is_mq = (rq->mq_ctx != NULL);
		int error;
		int error = BLKPREP_KILL;

		if (WARN_ON_ONCE(!blk_rq_nr_phys_segments(rq)))
		return -EINVAL;
		goto err_exit;

		error = scsi_init_sgtable(rq, &cmd->sdb);
		if (error)