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

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

f2fs: recover directory operations by fsync 



This fixes generic/342 which doesn't recover renamed file which was fsynced
before. It will be done via another fsync on newly created file.

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

fs/f2fs/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, 


	f2fs_update_time(F2FS_I_SB(dir), REQ_TIME);



	add_ino_entry(F2FS_I_SB(dir), dir->i_ino, TRANS_DIR_INO);



	if (f2fs_has_inline_dentry(dir))

		return f2fs_delete_inline_entry(dentry, page, dir, inode);

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ enum { 
	ORPHAN_INO,		/* for orphan ino list */

	APPEND_INO,		/* for append ino list */

	UPDATE_INO,		/* for update ino list */

	TRANS_DIR_INO,		/* for trasactions dir ino list */

	FLUSH_INO,		/* for multiple device flushing */

	MAX_INO_ENTRY,		/* max. list */

};
@@ -924,6 +925,7 @@ enum cp_reason_type { 
	CP_NODE_NEED_CP,

	CP_FASTBOOT_MODE,

	CP_SPEC_LOG_NUM,

	CP_RECOVER_DIR,

};



enum iostat_type {

fs/f2fs/file.c

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ static inline enum cp_reason_type need_do_checkpoint(struct inode *inode) 
		cp_reason = CP_FASTBOOT_MODE;

	else if (sbi->active_logs == 2)

		cp_reason = CP_SPEC_LOG_NUM;

	else if (need_dentry_mark(sbi, inode->i_ino) &&

		exist_written_data(sbi, F2FS_I(inode)->i_pino, TRANS_DIR_INO))

		cp_reason = CP_RECOVER_DIR;



	return cp_reason;

}

fs/f2fs/namei.c

+4 −0
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		}

		f2fs_i_links_write(old_dir, false);

	}

	add_ino_entry(sbi, new_dir->i_ino, TRANS_DIR_INO);



	f2fs_unlock_op(sbi);
@@ -1089,6 +1090,9 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	}

	f2fs_mark_inode_dirty_sync(new_dir, false);



	add_ino_entry(sbi, old_dir->i_ino, TRANS_DIR_INO);

	add_ino_entry(sbi, new_dir->i_ino, TRANS_DIR_INO);



	f2fs_unlock_op(sbi);



	if (IS_DIRSYNC(old_dir) || IS_DIRSYNC(new_dir))

include/trace/events/f2fs.h

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ TRACE_DEFINE_ENUM(CP_TRIMMED); 
		{ CP_NO_SPC_ROLL,	"no space roll forward" },	\

		{ CP_NODE_NEED_CP,	"node needs cp" },		\

		{ CP_FASTBOOT_MODE,	"fastboot mode" },		\

		{ CP_SPEC_LOG_NUM,	"log type is 2" })

		{ CP_SPEC_LOG_NUM,	"log type is 2" },		\

		{ CP_RECOVER_DIR,	"dir needs recovery" })



struct victim_sel_policy;

struct f2fs_map_blocks;