summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2021-04-27 10:30:08 +0200
committerMartin K. Petersen <martin.petersen@oracle.com>2021-05-31 22:48:20 -0400
commit21eccf304b3a16c26fc2878faca4665907a318ec (patch)
tree59d1ede5710b367e26d7325f5fe03b22bb31b6be /block
parent00da6a701a69b685ee7cac95b5c276e2d011dbca (diff)
downloadlinux-21eccf304b3a16c26fc2878faca4665907a318ec.tar.gz
linux-21eccf304b3a16c26fc2878faca4665907a318ec.tar.bz2
linux-21eccf304b3a16c26fc2878faca4665907a318ec.zip
scsi: scsi_ioctl: Return error code when blk_rq_map_kern() fails
The callers of sg_scsi_ioctl() already check for negative return values, so we can drop the usage of DRIVER_ERROR and return the error from blk_rq_map_kern() instead. Link: https://lore.kernel.org/r/20210427083046.31620-3-hare@suse.de Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 1b3fe99b83a6..48bb4e1ea1e7 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -484,9 +484,10 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
break;
}
- if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO)) {
- err = DRIVER_ERROR << 24;
- goto error;
+ if (bytes) {
+ err = blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO);
+ if (err)
+ goto error;
}
blk_execute_rq(disk, rq, 0);