diff options
| author | Chao Yu <yuchao0@huawei.com> | 2016-10-11 22:57:03 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@google.com> | 2017-09-25 15:04:53 -0700 |
| commit | 332f40b43f2f4a86eec4a2aaf1d3e3295ed673f2 (patch) | |
| tree | 5577c117cd7fbe45517473c8e7399da910fd844c /fs | |
| parent | 4c7eae1fef0c32f292507632ed7cbc9b0416b00e (diff) | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/data.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 4000ccb85a78..c390542917e4 100644 --- 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); |