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

Commit 7343b569 authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

f2fs: allocate hot_data for atomic write more strictly 



If a file not set type as hot, has dirty pages more than
threshold 64 before starting atomic write, may be lose hot
flag.

v1->v2: move set FI_ATOMIC_FILE flag behind flush dirty pages too,
in case of dirty pages before starting atomic use atomic mode to
write back.

Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent c6b22cb1

fs/f2fs/file.c

+6 −10
Original line number Diff line number Diff line
@@ -1691,24 +1691,20 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) 
	if (ret)

		goto out;



	set_inode_flag(inode, FI_ATOMIC_FILE);

	set_inode_flag(inode, FI_HOT_DATA);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);



	if (!get_dirty_pages(inode))

		goto inc_stat;

		goto skip_flush;



	f2fs_msg(F2FS_I_SB(inode)->sb, KERN_WARNING,

		"Unexpected flush for atomic writes: ino=%lu, npages=%u",

					inode->i_ino, get_dirty_pages(inode));

	ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX);

	if (ret) {

		clear_inode_flag(inode, FI_ATOMIC_FILE);

		clear_inode_flag(inode, FI_HOT_DATA);

	if (ret)

		goto out;

	}

skip_flush:

	set_inode_flag(inode, FI_HOT_DATA);

	set_inode_flag(inode, FI_ATOMIC_FILE);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);



inc_stat:

	F2FS_I(inode)->inmem_task = current;

	stat_inc_atomic_write(inode);

	stat_update_max_atomic_write(inode);