From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 11/12] fuse: Convert from readpages to readahead
Date: Sat, 1 Feb 2020 07:12:39 -0800 [thread overview]
Message-ID: <20200201151240.24082-12-willy@infradead.org> (raw)
In-Reply-To: <20200201151240.24082-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Use the new readahead operation in fuse. Switching away from the
read_cache_pages() helper gets rid of an implicit call to put_page(),
so we can get rid of the get_page() call in fuse_readpages_fill().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/fuse/file.c | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index ce715380143c..5460ff1bf155 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -911,9 +911,8 @@ struct fuse_fill_data {
unsigned int max_pages;
};
-static int fuse_readpages_fill(void *_data, struct page *page)
+static int fuse_readpages_fill(struct fuse_fill_data *data, struct page *page)
{
- struct fuse_fill_data *data = _data;
struct fuse_io_args *ia = data->ia;
struct fuse_args_pages *ap = &ia->ap;
struct inode *inode = data->inode;
@@ -929,10 +928,8 @@ static int fuse_readpages_fill(void *_data, struct page *page)
fc->max_pages);
fuse_send_readpages(ia, data->file);
data->ia = ia = fuse_io_alloc(NULL, data->max_pages);
- if (!ia) {
- unlock_page(page);
+ if (!ia)
return -ENOMEM;
- }
ap = &ia->ap;
}
@@ -942,7 +939,6 @@ static int fuse_readpages_fill(void *_data, struct page *page)
return -EIO;
}
- get_page(page);
ap->pages[ap->num_pages] = page;
ap->descs[ap->num_pages].length = PAGE_SIZE;
ap->num_pages++;
@@ -950,15 +946,13 @@ static int fuse_readpages_fill(void *_data, struct page *page)
return 0;
}
-static int fuse_readpages(struct file *file, struct address_space *mapping,
- struct list_head *pages, unsigned nr_pages)
+static unsigned fuse_readahead(struct file *file, struct address_space *mapping,
+ pgoff_t start, unsigned nr_pages)
{
struct inode *inode = mapping->host;
struct fuse_conn *fc = get_fuse_conn(inode);
struct fuse_fill_data data;
- int err;
- err = -EIO;
if (is_bad_inode(inode))
goto out;
@@ -966,21 +960,24 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
data.inode = inode;
data.nr_pages = nr_pages;
data.max_pages = min_t(unsigned int, nr_pages, fc->max_pages);
-;
data.ia = fuse_io_alloc(NULL, data.max_pages);
- err = -ENOMEM;
if (!data.ia)
goto out;
- err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data);
- if (!err) {
- if (data.ia->ap.num_pages)
- fuse_send_readpages(data.ia, file);
- else
- fuse_io_free(data.ia);
+ while (nr_pages) {
+ struct page *page = readahead_page(mapping, start++);
+
+ if (fuse_readpages_fill(&data, page) != 0)
+ goto out;
+ nr_pages--;
}
+
+ if (data.ia->ap.num_pages)
+ fuse_send_readpages(data.ia, file);
+ else
+ fuse_io_free(data.ia);
out:
- return err;
+ return nr_pages;
}
static ssize_t fuse_cache_read_iter(struct kiocb *iocb, struct iov_iter *to)
@@ -3358,10 +3355,10 @@ static const struct file_operations fuse_file_operations = {
static const struct address_space_operations fuse_file_aops = {
.readpage = fuse_readpage,
+ .readahead = fuse_readahead,
.writepage = fuse_writepage,
.writepages = fuse_writepages,
.launder_page = fuse_launder_page,
- .readpages = fuse_readpages,
.set_page_dirty = __set_page_dirty_nobuffers,
.bmap = fuse_bmap,
.direct_IO = fuse_direct_IO,
--
2.24.1
next prev parent reply other threads:[~2020-02-01 15:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-01 15:12 [PATCH v4 00/12] Change readahead API Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 01/12] mm: Fix the return type of __do_page_cache_readahead Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 02/12] readahead: Ignore return value of ->readpages Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 03/12] readahead: Put pages in cache earlier Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 04/12] mm: Add readahead address space operation Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 05/12] fs: Convert mpage_readpages to mpage_readahead Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 06/12] btrfs: Convert from readpages to readahead Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 07/12] erofs: Convert uncompressed files " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 08/12] erofs: Convert compressed " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 09/12] ext4: Convert " Matthew Wilcox
2020-02-01 15:12 ` [PATCH v4 10/12] f2fs: " Matthew Wilcox
2020-02-01 15:12 ` Matthew Wilcox [this message]
2020-02-01 15:12 ` [PATCH v4 12/12] iomap: " Matthew Wilcox
2020-02-04 15:32 ` [PATCH v4 00/12] Change readahead API David Sterba
2020-02-04 17:16 ` Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200201151240.24082-12-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).