lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH 05/12] scsi: Use iovec_import() instead of import_iovec().
Date

Signed-off-by: David Laight <david.laight@aculab.com>
---
block/scsi_ioctl.c | 14 ++++++++------
drivers/scsi/sg.c | 14 +++++++-------
2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index b4e73d5..df3a11b 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -327,20 +327,22 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
ret = 0;
if (hdr->iovec_count) {
struct iov_iter i;
- struct iovec *iov = NULL;
+ struct iovec *iov;

#ifdef CONFIG_COMPAT
if (in_compat_syscall())
- ret = compat_import_iovec(rq_data_dir(rq),
+ iov = compat_iovec_import(rq_data_dir(rq),
hdr->dxferp, hdr->iovec_count,
- 0, &iov, &i);
+ NULL, &i);
else
#endif
- ret = import_iovec(rq_data_dir(rq),
+ iov = iovec_import(rq_data_dir(rq),
hdr->dxferp, hdr->iovec_count,
- 0, &iov, &i);
- if (ret < 0)
+ NULL, &i);
+ if (IS_ERR(iov)) {
+ ret = PTR_ERR(iov);
goto out_free_cdb;
+ }

/* SG_IO howto says that the shorter of the two wins */
iov_iter_truncate(&i, hdr->dxfer_len);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 4e6af59..4733f7b 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1813,19 +1813,19 @@ static long sg_compat_ioctl(struct file *filp, unsigned int cmd_in, unsigned lon
}

if (iov_count) {
- struct iovec *iov = NULL;
+ struct iovec *iov;
struct iov_iter i;

#ifdef CONFIG_COMPAT
if (in_compat_syscall())
- res = compat_import_iovec(rw, hp->dxferp, iov_count,
- 0, &iov, &i);
+ iov = compat_iovec_import(rw, hp->dxferp, iov_count,
+ NULL, &i);
else
#endif
- res = import_iovec(rw, hp->dxferp, iov_count,
- 0, &iov, &i);
- if (res < 0)
- return res;
+ iov = iovec_import(rw, hp->dxferp, iov_count,
+ NULL, &i);
+ if (IS_ERR(iov))
+ return PTR_ERR(iov);

iov_iter_truncate(&i, hp->dxfer_len);
if (!iov_iter_count(&i)) {
--
1.8.1.2
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)

\
 
 \ /
  Last update: 2020-03-31 15:53    [W:0.025 / U:0.872 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site