lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 166/200] f2fs: do f2fs_balance_fs when block is allocated
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jaegeuk Kim <jaegeuk@kernel.org>

    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 | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/fs/f2fs/data.c
    +++ b/fs/f2fs/data.c
    @@ -504,7 +504,7 @@ static int __allocate_data_blocks(struct
    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
    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);

    \
     
     \ /
      Last update: 2016-05-03 03:21    [W:4.138 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site