| Message ID | 5666724f5947145cec4f7b774cf276eeb236eda5.1724791233.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fuse: convert to using folios and iomap | expand |
On Tue, Aug 27, 2024 at 1:46 PM Josef Bacik <josef@toxicpanda.com> wrote: > > We're just looking for pages in a mapping, use a folio and the folio > lookup function directly instead of using the page helper. > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> LGTM Reviewed-by: Joanne Koong <joannelkoong@gmail.com> > --- > fs/fuse/dev.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > index 7146038b2fe7..bcce75e07678 100644 > --- a/fs/fuse/dev.c > +++ b/fs/fuse/dev.c > @@ -1709,15 +1709,15 @@ static int fuse_retrieve(struct fuse_mount *fm, struct inode *inode, > index = outarg->offset >> PAGE_SHIFT; > > while (num && ap->num_pages < num_pages) { > - struct page *page; > + struct folio *folio; > unsigned int this_num; > > - page = find_get_page(mapping, index); > - if (!page) > + folio = __filemap_get_folio(mapping, index, 0, 0); > + if (IS_ERR(folio)) > break; > > this_num = min_t(unsigned, num, PAGE_SIZE - offset); > - ap->pages[ap->num_pages] = page; > + ap->pages[ap->num_pages] = &folio->page; > ap->descs[ap->num_pages].offset = offset; > ap->descs[ap->num_pages].length = this_num; > ap->num_pages++; > -- > 2.43.0 >
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 7146038b2fe7..bcce75e07678 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1709,15 +1709,15 @@ static int fuse_retrieve(struct fuse_mount *fm, struct inode *inode, index = outarg->offset >> PAGE_SHIFT; while (num && ap->num_pages < num_pages) { - struct page *page; + struct folio *folio; unsigned int this_num; - page = find_get_page(mapping, index); - if (!page) + folio = __filemap_get_folio(mapping, index, 0, 0); + if (IS_ERR(folio)) break; this_num = min_t(unsigned, num, PAGE_SIZE - offset); - ap->pages[ap->num_pages] = page; + ap->pages[ap->num_pages] = &folio->page; ap->descs[ap->num_pages].offset = offset; ap->descs[ap->num_pages].length = this_num; ap->num_pages++;
We're just looking for pages in a mapping, use a folio and the folio lookup function directly instead of using the page helper. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/fuse/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)