f2fs: Remove clear_page_private_all()

All callers can simply call folio_detach_private().  This was the
only way that clear_page_private_data() could be called, so remove
that too.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f1cbbea56a17c7d1baa455f0a1380a01f343ff02..a062defcb019a0e353606ec42ebc42252f68d709 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3736,7 +3736,7 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
                        f2fs_remove_dirty_inode(inode);
                }
        }
-       clear_page_private_all(&folio->page);
+       folio_detach_private(folio);
 }
 
 bool f2fs_release_folio(struct folio *folio, gfp_t wait)
@@ -3745,7 +3745,7 @@ bool f2fs_release_folio(struct folio *folio, gfp_t wait)
        if (folio_test_dirty(folio))
                return false;
 
-       clear_page_private_all(&folio->page);
+       folio_detach_private(folio);
        return true;
 }
 

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 888dca7e82ac98f367fdf453fe2a20a6ac7d96e6..fffd7749d6d1ec416e65229e3e8b4e3581651c4f 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -897,7 +897,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct folio *folio,
                f2fs_clear_page_cache_dirty_tag(folio);
                folio_clear_dirty_for_io(folio);
                folio_clear_uptodate(folio);
-               clear_page_private_all(&folio->page);
+               folio_detach_private(folio);
 
                inode_dec_dirty_pages(dir);
                f2fs_remove_dirty_inode(dir);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 48fc1279101f112312fa6e16ee97309b88c6a45f..1b3708480c3067d553418cad0cfe57789165fe19 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2547,24 +2547,6 @@ static inline void folio_set_f2fs_data(struct folio *folio, unsigned long data)
                folio->private = (void *)((unsigned long)folio->private | data);
 }
 
-static inline void clear_page_private_data(struct page *page)
-{
-       page_private(page) &= GENMASK(PAGE_PRIVATE_MAX - 1, 0);
-       if (page_private(page) == BIT(PAGE_PRIVATE_NOT_POINTER))
-               detach_page_private(page);
-}
-
-static inline void clear_page_private_all(struct page *page)
-{
-       clear_page_private_data(page);
-       clear_page_private_reference(page);
-       clear_page_private_gcing(page);
-       clear_page_private_inline(page);
-       clear_page_private_atomic(page);
-
-       f2fs_bug_on(F2FS_P_SB(page), page_private(page));
-}
-
 static inline void dec_valid_block_count(struct f2fs_sb_info *sbi,
                                                struct inode *inode,
                                                block_t count)