f2fs: clean up with clear_radix_tree_dirty_tag

Introduce clear_radix_tree_dirty_tag to include common codes for cleanup.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index c6752a3840fda8d08839110732a69d37be85a6f3..5add1266f5d08155071c928d822902363505cc35 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2594,6 +2594,17 @@ const struct address_space_operations f2fs_dblock_aops = {
 #endif
 };
 
+void clear_radix_tree_dirty_tag(struct page *page)
+{
+       struct address_space *mapping = page_mapping(page);
+       unsigned long flags;
+
+       spin_lock_irqsave(&mapping->tree_lock, flags);
+       radix_tree_tag_clear(&mapping->page_tree, page_index(page),
+                                       PAGECACHE_TAG_DIRTY);
+       spin_unlock_irqrestore(&mapping->tree_lock, flags);
+}
+
 int __init f2fs_init_post_read_processing(void)
 {
        bio_post_read_ctx_cache = KMEM_CACHE(bio_post_read_ctx, 0);

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index fe661274ff1064e0ed65ddeae4e68079a207e304..e20539ba0554f3f6a628322c3697204306b15104 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -698,8 +698,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
        struct  f2fs_dentry_block *dentry_blk;
        unsigned int bit_pos;
        int slots = GET_DENTRY_SLOTS(le16_to_cpu(dentry->name_len));
-       struct address_space *mapping = page_mapping(page);
-       unsigned long flags;
        int i;
 
        f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);
@@ -732,11 +730,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
 
        if (bit_pos == NR_DENTRY_IN_BLOCK &&
                        !truncate_hole(dir, page->index, page->index + 1)) {
-               spin_lock_irqsave(&mapping->tree_lock, flags);
-               radix_tree_tag_clear(&mapping->page_tree, page_index(page),
-                                    PAGECACHE_TAG_DIRTY);
-               spin_unlock_irqrestore(&mapping->tree_lock, flags);
-
+               clear_radix_tree_dirty_tag(page);
                clear_page_dirty_for_io(page);
                ClearPagePrivate(page);
                ClearPageUptodate(page);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1280ac403c114dfe4d3f466fd7dbc801499e1aec..bead8d756f99ad6fa868eaf3c82d3b5c008d3b27 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2965,6 +2965,7 @@ int f2fs_migrate_page(struct address_space *mapping, struct page *newpage,
                        struct page *page, enum migrate_mode mode);
 #endif
 bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len);
+void clear_radix_tree_dirty_tag(struct page *page);
 
 /*
  * gc.c

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index c274f137073c7472f45fd9b6d9d6af144500b3a6..83e6881fd21e4fb3efcf3cfd023e1201df1ad9ea 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -204,8 +204,6 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
 {
        void *src_addr, *dst_addr;
        struct dnode_of_data dn;
-       struct address_space *mapping = page_mapping(page);
-       unsigned long flags;
        int err;
 
        set_new_dnode(&dn, inode, NULL, NULL, 0);
@@ -227,10 +225,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
        kunmap_atomic(src_addr);
        set_page_dirty(dn.inode_page);
 
-       spin_lock_irqsave(&mapping->tree_lock, flags);
-       radix_tree_tag_clear(&mapping->page_tree, page_index(page),
-                            PAGECACHE_TAG_DIRTY);
-       spin_unlock_irqrestore(&mapping->tree_lock, flags);
+       clear_radix_tree_dirty_tag(page);
 
        set_inode_flag(inode, FI_APPEND_WRITE);
        set_inode_flag(inode, FI_DATA_EXIST);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 2311818c58a510f68c5add8357827bb4850af156..937bcdd79fbfde0b24addeec6056484a65ac7bd9 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -102,18 +102,10 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type)
 
 static void clear_node_page_dirty(struct page *page)
 {
-       struct address_space *mapping = page->mapping;
-       unsigned int long flags;
-
        if (PageDirty(page)) {
-               spin_lock_irqsave(&mapping->tree_lock, flags);
-               radix_tree_tag_clear(&mapping->page_tree,
-                               page_index(page),
-                               PAGECACHE_TAG_DIRTY);
-               spin_unlock_irqrestore(&mapping->tree_lock, flags);
-
+               clear_radix_tree_dirty_tag(page);
                clear_page_dirty_for_io(page);
-               dec_page_count(F2FS_M_SB(mapping), F2FS_DIRTY_NODES);
+               dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);
        }
        ClearPageUptodate(page);
 }