f2fs: recover directory operations by fsync
Jaegeuk Kim
maintainerPATCH 1/1 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.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/dir.c | 2 ++ fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 3 +++ fs/f2fs/namei.c | 4 ++++ 4 files changed, 11 insertions(+)
fs/f2fs/dir.c +2 -0
@@ -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
@@ -181,6 +181,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 */ };
@@ -930,6 +931,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
@@ -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
@@ -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))
Signature · 1 line
2.15.0.531.g2ccb3012c9-goog
Quoted 37 lines · Jaegeuk Kim
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.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/dir.c | 2 ++ fs/f2fs/f2fs.h | 2 ++ fs/f2fs/file.c | 3 +++ fs/f2fs/namei.c | 4 ++++ 4 files changed, 11 insertions(+)fs/f2fs/dir.c +2
-0@@ -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 +1
-0@@ -181,6 +181,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 */ };
fs/f2fs/f2fs.h enum cp_reason_type { · line 934
Quoted 4 lines
fs/f2fs/f2fs.h +1
-0@@ -930,6 +931,7 @@ enum cp_reason_type {CP_NODE_NEED_CP ,CP_FASTBOOT_MODE ,CP_SPEC_LOG_NUM , + CP_RECOVER_DIR,
Need to add description of CP_RECOVER_DIR in show_fsync_cpreason?
Otherwise, looks good to me.
Reviewed-by Chao Yu <[email protected]>
Thanks,
Quoted 39 lines
fs/f2fs/f2fs.h +0
-0};enum iostat_type {fs/f2fs/file.c +3
-0@@ -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 +3
-0@@ -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))