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

Commit e7c75ab0 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid out-of-order execution of atomic writes 



We need to flush data writes before flushing last node block writes by using
FUA with PREFLUSH. We don't need to guarantee precedent node writes since if
those are not written, we can't reach to the last node block when scanning
node block chain during roll-forward recovery.
Afterwards f2fs_wait_on_page_writeback guarantees all the IO submission to
disk, which builds a valid node block chain.

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

fs/f2fs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end, 
flush_out:

	remove_ino_entry(sbi, ino, UPDATE_INO);

	clear_inode_flag(inode, FI_UPDATE_WRITE);

	if (!atomic)

		ret = f2fs_issue_flush(sbi);

	f2fs_update_time(sbi, REQ_TIME);

out:

fs/f2fs/node.c

+7 −3
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ static struct page *last_fsync_dnode(struct f2fs_sb_info *sbi, nid_t ino) 
	return last_page;

}



static int __write_node_page(struct page *page,

static int __write_node_page(struct page *page, bool atomic,

				struct writeback_control *wbc)

{

	struct f2fs_sb_info *sbi = F2FS_P_SB(page);
@@ -1362,6 +1362,9 @@ static int __write_node_page(struct page *page, 
		return 0;

	}



	if (atomic && !test_opt(sbi, NOBARRIER))

		fio.op_flags |= REQ_PREFLUSH | REQ_FUA;



	set_page_writeback(page);

	fio.old_blkaddr = ni.blk_addr;

	write_node_page(nid, &fio);
@@ -1387,7 +1390,7 @@ static int __write_node_page(struct page *page, 
static int f2fs_write_node_page(struct page *page,

				struct writeback_control *wbc)

{

	return __write_node_page(page, wbc);

	return __write_node_page(page, false, wbc);

}



int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
@@ -1469,7 +1472,8 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, 
			if (!clear_page_dirty_for_io(page))

				goto continue_unlock;



			ret = __write_node_page(page, wbc);

			ret = __write_node_page(page, atomic &&

						page == last_page, wbc);

			if (ret) {

				unlock_page(page);

				f2fs_put_page(last_page, 0);

include/trace/events/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ TRACE_DEFINE_ENUM(CP_DISCARD); 
		{ REQ_SYNC | REQ_PRIO,	"(SP)" },			\

		{ REQ_META, 		"(M)" },			\

		{ REQ_META | REQ_PRIO,	"(MP)" },			\

		{ REQ_SYNC | REQ_PREFLUSH , "(SF)" },			\

		{ REQ_SYNC | REQ_META | REQ_PRIO, "(SMP)" },		\

		{ REQ_PREFLUSH | REQ_META | REQ_PRIO, "(FMP)" },	\

		{ 0, " \b" })