Introduce __remove_dirty_inode to clean up codes in remove_dirty_dir_inode.

Signed-off-by: Chao Yu <chao2...@samsung.com>
---
 fs/f2fs/checkpoint.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 1aca402..a4392f0 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -736,6 +736,20 @@ static void __add_dirty_inode(struct inode *inode)
        return;
 }
 
+static void __remove_dirty_inode(struct inode *inode)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+       struct f2fs_inode_info *fi = F2FS_I(inode);
+
+       if (get_dirty_pages(inode) ||
+                       !is_inode_flag_set(F2FS_I(inode), FI_DIRTY_DIR))
+               return;
+
+       list_del_init(&fi->dirty_list);
+       clear_inode_flag(fi, FI_DIRTY_DIR);
+       stat_dec_dirty_dir(sbi);
+}
+
 void update_dirty_page(struct inode *inode, struct page *page)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@@ -777,15 +791,7 @@ void remove_dirty_dir_inode(struct inode *inode)
                return;
 
        spin_lock(&sbi->dir_inode_lock);
-       if (get_dirty_pages(inode) ||
-                       !is_inode_flag_set(F2FS_I(inode), FI_DIRTY_DIR)) {
-               spin_unlock(&sbi->dir_inode_lock);
-               return;
-       }
-
-       list_del_init(&fi->dirty_list);
-       clear_inode_flag(fi, FI_DIRTY_DIR);
-       stat_dec_dirty_dir(sbi);
+       __remove_dirty_inode(inode);
        spin_unlock(&sbi->dir_inode_lock);
 
        /* Only from the recovery routine */
-- 
2.6.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to