f2fs: avoid writing inode redundantly when creating a file

[firefly-linux-kernel-4.4.55.git] / fs / f2fs / inode.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 2b2d45d19e3ea1e1101ff893a2ce9e0f19e607ea..7f8569bd875906bbbbbbb3fd7fef222d10243520 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -56,7 +56,7 @@ static int do_read_inode(struct inode *inode)
        if (IS_ERR(node_page))
                return PTR_ERR(node_page);
 
-       rn = page_address(node_page);
+       rn = F2FS_NODE(node_page);
        ri = &(rn->i);
 
        inode->i_mode = le16_to_cpu(ri->i_mode);
@@ -151,9 +151,9 @@ void update_inode(struct inode *inode, struct page *node_page)
        struct f2fs_node *rn;
        struct f2fs_inode *ri;
 
-       wait_on_page_writeback(node_page);
+       f2fs_wait_on_page_writeback(node_page, NODE, false);
 
-       rn = page_address(node_page);
+       rn = F2FS_NODE(node_page);
        ri = &(rn->i);
 
        ri->i_mode = cpu_to_le16(inode->i_mode);
@@ -221,9 +221,6 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)
        if (!is_inode_flag_set(F2FS_I(inode), FI_DIRTY_INODE))
                return 0;
 
-       if (wbc)
-               f2fs_balance_fs(sbi);
-
        /*
         * We need to lock here to prevent from producing dirty node pages
         * during the urgent cleaning time when runing out of free sections.
@@ -231,6 +228,10 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)
        ilock = mutex_lock_op(sbi);
        ret = update_inode_page(inode);
        mutex_unlock_op(sbi, ilock);
+
+       if (wbc)
+               f2fs_balance_fs(sbi);
+
        return ret;
 }