]> git.hungrycats.org Git - linux/commitdiff
f2fs: do f2fs_balance_fs when block is allocated
authorJaegeuk Kim <jaegeuk@kernel.org>
Sat, 23 Jan 2016 21:35:18 +0000 (13:35 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 May 2016 21:49:13 +0000 (14:49 -0700)
commit 3c082b7b5b28be606ed9ef11e4741df7c722c92e upstream.

We should consider data block allocation to trigger f2fs_balance_fs.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/f2fs/data.c

index 5c06db17e41fa267f5b270061d2959b2a36803e4..3e2ea9a5e4d97ec30fbd96f80836de3471025f59 100644 (file)
@@ -504,7 +504,7 @@ static int __allocate_data_blocks(struct inode *inode, loff_t offset,
        struct dnode_of_data dn;
        u64 start = F2FS_BYTES_TO_BLK(offset);
        u64 len = F2FS_BYTES_TO_BLK(count);
-       bool allocated;
+       bool allocated = false;
        u64 end_offset;
        int err = 0;
 
@@ -546,7 +546,7 @@ static int __allocate_data_blocks(struct inode *inode, loff_t offset,
                f2fs_put_dnode(&dn);
                f2fs_unlock_op(sbi);
 
-               f2fs_balance_fs(sbi, dn.node_changed);
+               f2fs_balance_fs(sbi, allocated);
        }
        return err;
 
@@ -556,7 +556,7 @@ sync_out:
        f2fs_put_dnode(&dn);
 out:
        f2fs_unlock_op(sbi);
-       f2fs_balance_fs(sbi, dn.node_changed);
+       f2fs_balance_fs(sbi, allocated);
        return err;
 }
 
@@ -650,14 +650,14 @@ get_next:
        if (dn.ofs_in_node >= end_offset) {
                if (allocated)
                        sync_inode_page(&dn);
-               allocated = false;
                f2fs_put_dnode(&dn);
 
                if (create) {
                        f2fs_unlock_op(sbi);
-                       f2fs_balance_fs(sbi, dn.node_changed);
+                       f2fs_balance_fs(sbi, allocated);
                        f2fs_lock_op(sbi);
                }
+               allocated = false;
 
                set_new_dnode(&dn, inode, NULL, NULL, 0);
                err = get_dnode_of_data(&dn, pgofs, mode);
@@ -715,7 +715,7 @@ put_out:
 unlock_out:
        if (create) {
                f2fs_unlock_op(sbi);
-               f2fs_balance_fs(sbi, dn.node_changed);
+               f2fs_balance_fs(sbi, allocated);
        }
 out:
        trace_f2fs_map_blocks(inode, map, err);