Messages in this thread Patch in this message | | | Subject | [PATCH 2/6] fuse: cosmetic rework of fuse_send_readpages | From | Maxim Patlasov <> | Date | Thu, 21 Aug 2014 20:08:18 +0400 |
| |
The patch change arguments of fuse_send_readpages to give it access to inode (will be used in the next patch of patch-set). The change is cosmetic, no logic changed.
Signed-off-by: Maxim Patlasov <mpatlasov@parallels.com> --- fs/fuse/file.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 912061a..7723b3f 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -827,8 +827,17 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req) fuse_file_put(req->ff, false); } -static void fuse_send_readpages(struct fuse_req *req, struct file *file) +struct fuse_fill_data { + struct fuse_req *req; + struct file *file; + struct inode *inode; + unsigned nr_pages; +}; + +static void fuse_send_readpages(struct fuse_fill_data *data) { + struct fuse_req *req = data->req; + struct file *file = data->file; struct fuse_file *ff = file->private_data; struct fuse_conn *fc = ff->fc; loff_t pos = page_offset(req->pages[0]); @@ -850,13 +859,6 @@ static void fuse_send_readpages(struct fuse_req *req, struct file *file) } } -struct fuse_fill_data { - struct fuse_req *req; - struct file *file; - struct inode *inode; - unsigned nr_pages; -}; - static int fuse_readpages_fill(void *_data, struct page *page) { struct fuse_fill_data *data = _data; @@ -872,7 +874,7 @@ static int fuse_readpages_fill(void *_data, struct page *page) req->pages[req->num_pages - 1]->index + 1 != page->index)) { int nr_alloc = min_t(unsigned, data->nr_pages, FUSE_MAX_PAGES_PER_REQ); - fuse_send_readpages(req, data->file); + fuse_send_readpages(data); if (fc->async_read) req = fuse_get_req_for_background(fc, nr_alloc); else @@ -925,7 +927,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data); if (!err) { if (data.req->num_pages) - fuse_send_readpages(data.req, file); + fuse_send_readpages(&data); else fuse_put_request(fc, data.req); }
| |