Skip to content

Commit d22a943

Browse files
author
Al Viro
committed
fuse: pull iov_iter initializations up
... to fuse_direct_{read,write}(). ->direct_IO() path uses the iov_iter passed by the caller instead. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 7b2c99d commit d22a943

File tree

3 files changed

+38
-30
lines changed

3 files changed

+38
-30
lines changed

‎fs/fuse/cuse.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ static ssize_t cuse_read(struct file *file, char __user *buf, size_t count,
9494
loff_t pos = 0;
9595
struct iovec iov = { .iov_base = buf, .iov_len = count };
9696
struct fuse_io_priv io = { .async = 0, .file = file };
97+
struct iov_iter ii;
98+
iov_iter_init(&ii, READ, &iov, 1, count);
9799

98-
return fuse_direct_io(&io, &iov, 1, count, &pos, FUSE_DIO_CUSE);
100+
return fuse_direct_io(&io, &ii, &pos, FUSE_DIO_CUSE);
99101
}
100102

101103
static ssize_t cuse_write(struct file *file, const char __user *buf,
@@ -104,12 +106,14 @@ static ssize_t cuse_write(struct file *file, const char __user *buf,
104106
loff_t pos = 0;
105107
struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
106108
struct fuse_io_priv io = { .async = 0, .file = file };
109+
struct iov_iter ii;
110+
iov_iter_init(&ii, WRITE, &iov, 1, count);
107111

108112
/*
109113
* No locking or generic_write_checks(), the server is
110114
* responsible for locking and sanity checks.
111115
*/
112-
return fuse_direct_io(&io, &iov, 1, count, &pos,
116+
return fuse_direct_io(&io, &ii, &pos,
113117
FUSE_DIO_WRITE | FUSE_DIO_CUSE);
114118
}
115119

‎fs/fuse/file.c

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,9 +1368,8 @@ static inline int fuse_iter_npages(const struct iov_iter *ii_p)
13681368
return min(npages, FUSE_MAX_PAGES_PER_REQ);
13691369
}
13701370

1371-
ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
1372-
unsigned long nr_segs, size_t count, loff_t *ppos,
1373-
int flags)
1371+
ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
1372+
loff_t *ppos, int flags)
13741373
{
13751374
int write = flags & FUSE_DIO_WRITE;
13761375
int cuse = flags & FUSE_DIO_CUSE;
@@ -1380,18 +1379,16 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
13801379
struct fuse_conn *fc = ff->fc;
13811380
size_t nmax = write ? fc->max_write : fc->max_read;
13821381
loff_t pos = *ppos;
1382+
size_t count = iov_iter_count(iter);
13831383
pgoff_t idx_from = pos >> PAGE_CACHE_SHIFT;
13841384
pgoff_t idx_to = (pos + count - 1) >> PAGE_CACHE_SHIFT;
13851385
ssize_t res = 0;
13861386
struct fuse_req *req;
1387-
struct iov_iter ii;
1388-
1389-
iov_iter_init(&ii, write ? WRITE : READ, iov, nr_segs, count);
13901387

13911388
if (io->async)
1392-
req = fuse_get_req_for_background(fc, fuse_iter_npages(&ii));
1389+
req = fuse_get_req_for_background(fc, fuse_iter_npages(iter));
13931390
else
1394-
req = fuse_get_req(fc, fuse_iter_npages(&ii));
1391+
req = fuse_get_req(fc, fuse_iter_npages(iter));
13951392
if (IS_ERR(req))
13961393
return PTR_ERR(req);
13971394

@@ -1407,7 +1404,7 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
14071404
size_t nres;
14081405
fl_owner_t owner = current->files;
14091406
size_t nbytes = min(count, nmax);
1410-
int err = fuse_get_user_pages(req, &ii, &nbytes, write);
1407+
int err = fuse_get_user_pages(req, iter, &nbytes, write);
14111408
if (err) {
14121409
res = err;
14131410
break;
@@ -1437,9 +1434,9 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
14371434
fuse_put_request(fc, req);
14381435
if (io->async)
14391436
req = fuse_get_req_for_background(fc,
1440-
fuse_iter_npages(&ii));
1437+
fuse_iter_npages(iter));
14411438
else
1442-
req = fuse_get_req(fc, fuse_iter_npages(&ii));
1439+
req = fuse_get_req(fc, fuse_iter_npages(iter));
14431440
if (IS_ERR(req))
14441441
break;
14451442
}
@@ -1454,9 +1451,8 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
14541451
EXPORT_SYMBOL_GPL(fuse_direct_io);
14551452

14561453
static ssize_t __fuse_direct_read(struct fuse_io_priv *io,
1457-
const struct iovec *iov,
1458-
unsigned long nr_segs, loff_t *ppos,
1459-
size_t count)
1454+
struct iov_iter *iter,
1455+
loff_t *ppos)
14601456
{
14611457
ssize_t res;
14621458
struct file *file = io->file;
@@ -1465,7 +1461,7 @@ static ssize_t __fuse_direct_read(struct fuse_io_priv *io,
14651461
if (is_bad_inode(inode))
14661462
return -EIO;
14671463

1468-
res = fuse_direct_io(io, iov, nr_segs, count, ppos, 0);
1464+
res = fuse_direct_io(io, iter, ppos, 0);
14691465

14701466
fuse_invalidate_attr(inode);
14711467

@@ -1477,22 +1473,27 @@ static ssize_t fuse_direct_read(struct file *file, char __user *buf,
14771473
{
14781474
struct fuse_io_priv io = { .async = 0, .file = file };
14791475
struct iovec iov = { .iov_base = buf, .iov_len = count };
1480-
return __fuse_direct_read(&io, &iov, 1, ppos, count);
1476+
struct iov_iter ii;
1477+
iov_iter_init(&ii, READ, &iov, 1, count);
1478+
return __fuse_direct_read(&io, &ii, ppos);
14811479
}
14821480

14831481
static ssize_t __fuse_direct_write(struct fuse_io_priv *io,
1484-
const struct iovec *iov,
1485-
unsigned long nr_segs, loff_t *ppos)
1482+
struct iov_iter *iter,
1483+
loff_t *ppos)
14861484
{
14871485
struct file *file = io->file;
14881486
struct inode *inode = file_inode(file);
1489-
size_t count = iov_length(iov, nr_segs);
1487+
size_t count = iov_iter_count(iter);
14901488
ssize_t res;
14911489

1490+
14921491
res = generic_write_checks(file, ppos, &count, 0);
1493-
if (!res)
1494-
res = fuse_direct_io(io, iov, nr_segs, count, ppos,
1495-
FUSE_DIO_WRITE);
1492+
if (!res) {
1493+
if (iter->count > count)
1494+
iter->count = count;
1495+
res = fuse_direct_io(io, iter, ppos, FUSE_DIO_WRITE);
1496+
}
14961497

14971498
fuse_invalidate_attr(inode);
14981499

@@ -1506,13 +1507,15 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
15061507
struct inode *inode = file_inode(file);
15071508
ssize_t res;
15081509
struct fuse_io_priv io = { .async = 0, .file = file };
1510+
struct iov_iter ii;
1511+
iov_iter_init(&ii, WRITE, &iov, 1, count);
15091512

15101513
if (is_bad_inode(inode))
15111514
return -EIO;
15121515

15131516
/* Don't allow parallel writes to the same file */
15141517
mutex_lock(&inode->i_mutex);
1515-
res = __fuse_direct_write(&io, &iov, 1, ppos);
1518+
res = __fuse_direct_write(&io, &ii, ppos);
15161519
if (res > 0)
15171520
fuse_write_update_size(inode, *ppos);
15181521
mutex_unlock(&inode->i_mutex);
@@ -2914,6 +2917,8 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
29142917
if (offset >= i_size)
29152918
return 0;
29162919
count = min_t(loff_t, count, fuse_round_up(i_size - offset));
2920+
if (iter->count > count)
2921+
iter->count = count;
29172922
}
29182923

29192924
io = kmalloc(sizeof(struct fuse_io_priv), GFP_KERNEL);
@@ -2943,9 +2948,9 @@ fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
29432948
io->async = false;
29442949

29452950
if (rw == WRITE)
2946-
ret = __fuse_direct_write(io, iter->iov, iter->nr_segs, &pos);
2951+
ret = __fuse_direct_write(io, iter, &pos);
29472952
else
2948-
ret = __fuse_direct_read(io, iter->iov, iter->nr_segs, &pos, count);
2953+
ret = __fuse_direct_read(io, iter, &pos);
29492954

29502955
if (io->async) {
29512956
fuse_aio_complete(io, ret < 0 ? ret : 0, -1);

‎fs/fuse/fuse_i.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -880,9 +880,8 @@ int fuse_do_open(struct fuse_conn *fc, u64 nodeid, struct file *file,
880880
/** CUSE pass fuse_direct_io() a file which f_mapping->host is not from FUSE */
881881
#define FUSE_DIO_CUSE (1 << 1)
882882

883-
ssize_t fuse_direct_io(struct fuse_io_priv *io, const struct iovec *iov,
884-
unsigned long nr_segs, size_t count, loff_t *ppos,
885-
int flags);
883+
ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter,
884+
loff_t *ppos, int flags);
886885
long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
887886
unsigned int flags);
888887
long fuse_ioctl_common(struct file *file, unsigned int cmd,

0 commit comments

Comments
 (0)