2021-08-23 13:41:24

by Halil Pasic

Subject: [PATCH] scsi: scsi_ioctl: fix error code propagation in SG_IO

Fixes: f2542a3be327 ("scsi: scsi_ioctl: Move the "block layer" SCSI
ioctl handling to drivers/scsi")
Signed-off-by: Halil Pasic <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
---
This is a patch against the for-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git and/or
linux-next/master.
---
drivers/scsi/scsi_ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 7b2b0a1581f4..6ff2207bd45a 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -874,7 +874,7 @@ static int scsi_ioctl_sg_io(struct scsi_device *sdev, struct gendisk *disk,
return error;
if (put_sg_io_hdr(&hdr, argp))
return -EFAULT;
- return 0;
+ return error;
}

/**
--
2.25.1

2021-08-24 03:25:49

by Martin K. Petersen

Subject: Re: [PATCH] scsi: scsi_ioctl: fix error code propagation in SG_IO

Halil,

> Fixes: f2542a3be327 ("scsi: scsi_ioctl: Move the "block layer" SCSI
> ioctl handling to drivers/scsi")

Applied to 5.15/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2021-08-28 02:35:03

by Martin K. Petersen

Subject: Re: [PATCH] scsi: scsi_ioctl: fix error code propagation in SG_IO

On Mon, 23 Aug 2021 15:34:58 +0200, Halil Pasic wrote:

>


Applied to 5.15/scsi-queue, thanks!

[1/1] scsi: scsi_ioctl: fix error code propagation in SG_IO
https://git.kernel.org/mkp/scsi/c/04a71cdc46a9

--
Martin K. Petersen Oracle Linux Engineering