Commit d07f09f5 authored by Maxim Patlasov's avatar Maxim Patlasov Committed by Miklos Szeredi

fuse: rework fuse_perform_write()

The patch allocates as many page pointers in fuse_req as needed to cover
interval [pos .. pos+len-1]. Inline helper fuse_wr_pages() is introduced
to hide this cumbersome arithmetic.
Signed-off-by: default avatarMaxim Patlasov <mpatlasov@parallels.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent f8dbdf81
...@@ -881,11 +881,19 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req, ...@@ -881,11 +881,19 @@ static ssize_t fuse_fill_write_pages(struct fuse_req *req,
if (!fc->big_writes) if (!fc->big_writes)
break; break;
} while (iov_iter_count(ii) && count < fc->max_write && } while (iov_iter_count(ii) && count < fc->max_write &&
req->num_pages < FUSE_MAX_PAGES_PER_REQ && offset == 0); req->num_pages < req->max_pages && offset == 0);
return count > 0 ? count : err; return count > 0 ? count : err;
} }
static inline unsigned fuse_wr_pages(loff_t pos, size_t len)
{
return min_t(unsigned,
((pos + len - 1) >> PAGE_CACHE_SHIFT) -
(pos >> PAGE_CACHE_SHIFT) + 1,
FUSE_MAX_PAGES_PER_REQ);
}
static ssize_t fuse_perform_write(struct file *file, static ssize_t fuse_perform_write(struct file *file,
struct address_space *mapping, struct address_space *mapping,
struct iov_iter *ii, loff_t pos) struct iov_iter *ii, loff_t pos)
...@@ -901,8 +909,9 @@ static ssize_t fuse_perform_write(struct file *file, ...@@ -901,8 +909,9 @@ static ssize_t fuse_perform_write(struct file *file,
do { do {
struct fuse_req *req; struct fuse_req *req;
ssize_t count; ssize_t count;
unsigned nr_pages = fuse_wr_pages(pos, iov_iter_count(ii));
req = fuse_get_req(fc, FUSE_MAX_PAGES_PER_REQ); req = fuse_get_req(fc, nr_pages);
if (IS_ERR(req)) { if (IS_ERR(req)) {
err = PTR_ERR(req); err = PTR_ERR(req);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment