summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-28 09:59:27 +0900
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-28 15:03:06 +0900
commitafc3eda2a897b402e59f42f22eb89bba52297dd3 (patch)
tree26763b187f63785f9bc07e4ce0c14ea4ea0034f0
parent6b8213d9a4ca0d7a02a38757068ba79cd96206f0 (diff)
downloadlinux-afc3eda2a897b402e59f42f22eb89bba52297dd3.tar.bz2
f2fs: fix incorrect iputs during the dentry recovery
- iget/iput flow in the dentry recovery process 1. *dir* = f2fs_iget 2. set FI_DELAY_IPUT to *dir* 3. add *dir* to the dirty_dir_list - __f2fs_add_link - recover_dentry) 4. iput *dir* by remove_dirty_dir_inode - sync_dirty_dir_inodes - write_chekcpoint If *dir*'s i_count is not 1 (i.e., root dir), remove_dirty_dir_inode is called later and then iput is triggered again due to the FI_DELAY_IPUT flag. So, let's unset the flag properly once iput is triggered. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
-rw-r--r--fs/f2fs/checkpoint.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 0d3701dce462..6f56e5781dc3 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -521,8 +521,10 @@ void remove_dirty_dir_inode(struct inode *inode)
spin_unlock(&sbi->dir_inode_lock);
/* Only from the recovery routine */
- if (is_inode_flag_set(F2FS_I(inode), FI_DELAY_IPUT))
+ if (is_inode_flag_set(F2FS_I(inode), FI_DELAY_IPUT)) {
+ clear_inode_flag(F2FS_I(inode), FI_DELAY_IPUT);
iput(inode);
+ }
}
struct inode *check_dirty_dir_inode(struct f2fs_sb_info *sbi, nid_t ino)