Skip to content

Commit b2c0829

Browse files
author
Jaegeuk Kim
committed
f2fs: do checkpoint for the renamed inode
If an inode is renamed, it should be registered as file_lost_pino to conduct checkpoint at f2fs_sync_file. Otherwise, the inode cannot be recovered due to no dent_mark in the following scenario. Note that, this scenario is from xfstests/322. 1. create "a" 2. fsync "a" 3. rename "a" to "b" 4. fsync "b" 5. Sudden power-cut After recovery is done, "b" should be seen. However, the result shows "a", since the recovery procedure does not enter recover_dentry due to no dent_mark. The reason is like below. - The nid of "a" is checkpointed during #2, f2fs_sync_file. - The inode page for "b" produced by #3 is written without dent_mark by sync_node_pages. So, this patch fixes this bug by assinging file_lost_pino to the "a"'s inode. If the pino is lost, f2fs_sync_file conducts checkpoint, and then recovers the latest pino and its dentry information for further recovery. Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent dd4d961 commit b2c0829

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

fs/f2fs/namei.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
417417
}
418418

419419
f2fs_set_link(new_dir, new_entry, new_page, old_inode);
420-
down_write(&F2FS_I(old_inode)->i_sem);
421-
F2FS_I(old_inode)->i_pino = new_dir->i_ino;
422-
up_write(&F2FS_I(old_inode)->i_sem);
423420

424421
new_inode->i_ctime = CURRENT_TIME;
425422
down_write(&F2FS_I(new_inode)->i_sem);
@@ -448,6 +445,10 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
448445
}
449446
}
450447

448+
down_write(&F2FS_I(old_inode)->i_sem);
449+
file_lost_pino(old_inode);
450+
up_write(&F2FS_I(old_inode)->i_sem);
451+
451452
old_inode->i_ctime = CURRENT_TIME;
452453
mark_inode_dirty(old_inode);
453454

@@ -457,9 +458,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
457458
if (old_dir != new_dir) {
458459
f2fs_set_link(old_inode, old_dir_entry,
459460
old_dir_page, new_dir);
460-
down_write(&F2FS_I(old_inode)->i_sem);
461-
F2FS_I(old_inode)->i_pino = new_dir->i_ino;
462-
up_write(&F2FS_I(old_inode)->i_sem);
463461
update_inode_page(old_inode);
464462
} else {
465463
kunmap(old_dir_page);

0 commit comments

Comments
 (0)