f2fs: merge {invalidate,release}page for meta/node/data pages

[karo-tx-linux.git] / fs / f2fs / checkpoint.c

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 470fa58606b205a6920291b37fa32c41819b855c..31a715b5fd5cd3a89e92fe27141af981b4688b4b 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -309,32 +309,12 @@ static int f2fs_set_meta_page_dirty(struct page *page)
        return 0;
 }
 
-static void f2fs_invalidate_meta_page(struct page *page, unsigned int offset,
-                                     unsigned int length)
-{
-       struct inode *inode = page->mapping->host;
-
-       if (PageDirty(page))
-               dec_page_count(F2FS_I_SB(inode), F2FS_DIRTY_META);
-       ClearPagePrivate(page);
-}
-
-static int f2fs_release_meta_page(struct page *page, gfp_t wait)
-{
-       /* If this is dirty page, keep PagePrivate */
-       if (PageDirty(page))
-               return 0;
-
-       ClearPagePrivate(page);
-       return 1;
-}
-
 const struct address_space_operations f2fs_meta_aops = {
        .writepage      = f2fs_write_meta_page,
        .writepages     = f2fs_write_meta_pages,
        .set_page_dirty = f2fs_set_meta_page_dirty,
-       .invalidatepage = f2fs_invalidate_meta_page,
-       .releasepage    = f2fs_release_meta_page,
+       .invalidatepage = f2fs_invalidate_page,
+       .releasepage    = f2fs_release_page,
 };
 
 static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, int type)