Skip to content

Commit 949d67a

Browse files
josefbacikMiklos Szeredi
authored andcommitted
fuse: use the folio based vmstat helpers
In order to make it easier to switch to folios in the fuse_args_pages update the places where we update the vmstat counters for writeback to use the folio related helpers. On the inc side this is easy as we already have the folio, on the dec side we have to page_folio() the pages for now. Reviewed-by: Joanne Koong <[email protected]> Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
1 parent 6930b8d commit 949d67a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

fs/fuse/file.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,12 +1820,12 @@ static void fuse_writepage_free(struct fuse_writepage_args *wpa)
18201820
kfree(wpa);
18211821
}
18221822

1823-
static void fuse_writepage_finish_stat(struct inode *inode, struct page *page)
1823+
static void fuse_writepage_finish_stat(struct inode *inode, struct folio *folio)
18241824
{
18251825
struct backing_dev_info *bdi = inode_to_bdi(inode);
18261826

18271827
dec_wb_stat(&bdi->wb, WB_WRITEBACK);
1828-
dec_node_page_state(page, NR_WRITEBACK_TEMP);
1828+
node_stat_sub_folio(folio, NR_WRITEBACK_TEMP);
18291829
wb_writeout_inc(&bdi->wb);
18301830
}
18311831

@@ -1837,7 +1837,7 @@ static void fuse_writepage_finish(struct fuse_writepage_args *wpa)
18371837
int i;
18381838

18391839
for (i = 0; i < ap->num_pages; i++)
1840-
fuse_writepage_finish_stat(inode, ap->pages[i]);
1840+
fuse_writepage_finish_stat(inode, page_folio(ap->pages[i]));
18411841

18421842
wake_up(&fi->page_waitq);
18431843
}
@@ -1892,7 +1892,8 @@ __acquires(fi->lock)
18921892
for (aux = wpa->next; aux; aux = next) {
18931893
next = aux->next;
18941894
aux->next = NULL;
1895-
fuse_writepage_finish_stat(aux->inode, aux->ia.ap.pages[0]);
1895+
fuse_writepage_finish_stat(aux->inode,
1896+
page_folio(aux->ia.ap.pages[0]));
18961897
fuse_writepage_free(aux);
18971898
}
18981899

@@ -2112,7 +2113,7 @@ static void fuse_writepage_args_page_fill(struct fuse_writepage_args *wpa, struc
21122113
ap->descs[page_index].length = PAGE_SIZE;
21132114

21142115
inc_wb_stat(&inode_to_bdi(inode)->wb, WB_WRITEBACK);
2115-
inc_node_page_state(&tmp_folio->page, NR_WRITEBACK_TEMP);
2116+
node_stat_add_folio(tmp_folio, NR_WRITEBACK_TEMP);
21162117
}
21172118

21182119
static struct fuse_writepage_args *fuse_writepage_args_setup(struct folio *folio,
@@ -2286,7 +2287,8 @@ static bool fuse_writepage_add(struct fuse_writepage_args *new_wpa,
22862287
spin_unlock(&fi->lock);
22872288

22882289
if (tmp) {
2289-
fuse_writepage_finish_stat(new_wpa->inode, new_ap->pages[0]);
2290+
fuse_writepage_finish_stat(new_wpa->inode,
2291+
page_folio(new_ap->pages[0]));
22902292
fuse_writepage_free(new_wpa);
22912293
}
22922294

0 commit comments

Comments
 (0)