f2fs: don't miss any f2fs_balance_fs cases

commit 6f2d8ed654bfa391854df4de854953f772a16a9d upstream.

In f2fs_map_blocks, let f2fs_balance_fs detects node page modification
with dn.node_changed to avoid miss some corner cases.

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 4000ccb85a78ca377856cb5bfc06d9f50d0c5b61..c390542917e4215575088bc41fcb74fa9328e1bb 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -671,7 +671,6 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
        unsigned int ofs_in_node, last_ofs_in_node;
        blkcnt_t prealloc;
        struct extent_info ei;
-       bool allocated = false;
        block_t blkaddr;
 
        if (!maxblocks)
@@ -730,10 +729,8 @@ next_block:
                                }
                        } else {
                                err = __allocate_data_block(&dn);
-                               if (!err) {
+                               if (!err)
                                        set_inode_flag(inode, FI_APPEND_WRITE);
-                                       allocated = true;
-                               }
                        }
                        if (err)
                                goto sync_out;
@@ -788,7 +785,6 @@ skip:
                err = reserve_new_blocks(&dn, prealloc);
                if (err)
                        goto sync_out;
-               allocated = dn.node_changed;
 
                map->m_len += dn.ofs_in_node - ofs_in_node;
                if (prealloc && dn.ofs_in_node != last_ofs_in_node + 1) {
@@ -807,9 +803,8 @@ skip:
 
        if (create) {
                f2fs_unlock_op(sbi);
-               f2fs_balance_fs(sbi, allocated);
+               f2fs_balance_fs(sbi, dn.node_changed);
        }
-       allocated = false;
        goto next_dnode;
 
 sync_out:
@@ -817,7 +812,7 @@ sync_out:
 unlock_out:
        if (create) {
                f2fs_unlock_op(sbi);
-               f2fs_balance_fs(sbi, allocated);
+               f2fs_balance_fs(sbi, dn.node_changed);
        }
 out:
        trace_f2fs_map_blocks(inode, map, err);