Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f2d8ed6 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: don't miss any f2fs_balance_fs cases 



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: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9434fcde

fs/f2fs/data.c

+3 −8
Original line number Diff line number Diff line
@@ -676,7 +676,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)
@@ -735,10 +734,8 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
				}

			} else {

				err = __allocate_data_block(&dn);

				if (!err) {

				if (!err)

					set_inode_flag(inode, FI_APPEND_WRITE);

					allocated = true;

				}

			}

			if (err)

				goto sync_out;
@@ -793,7 +790,6 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
		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) {
@@ -812,9 +808,8 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 


	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:
@@ -822,7 +817,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
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);