summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-28 05:25:47 +0200
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-05-28 08:03:06 +0200
commit83d5d6f66b375f21bee4c2e17178f7c073a66301 (patch)
tree1373f4abee6f281933f9e7fee9dfa5cb3d831f7c /fs/f2fs
parentf2fs: fix incorrect iputs during the dentry recovery (diff)
downloadlinux-83d5d6f66b375f21bee4c2e17178f7c073a66301.tar.xz
linux-83d5d6f66b375f21bee4c2e17178f7c073a66301.zip
f2fs: cover cp_file information with ilock
If a file is linked with other files, it should be checkpointed at every fsync calls. For this, we use set_cp_file() with FADVISE_CP_BIT, but previously we didn't cover the flag by the global lock. This patch fixes that the inode page stores this correctly. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/dir.c8
-rw-r--r--fs/f2fs/namei.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index b278bfbc3646..67e2d1361fa2 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -346,8 +346,14 @@ static struct page *init_inode_metadata(struct inode *inode,
init_dent_inode(name, page);
- if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK))
+ /*
+ * This file should be checkpointed during fsync.
+ * We lost i_pino from now on.
+ */
+ if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK)) {
+ set_cp_file(inode);
inc_nlink(inode);
+ }
return page;
error:
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index efe0a127cb76..1fe150276fad 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -181,12 +181,6 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,
if (err)
goto out;
- /*
- * This file should be checkpointed during fsync.
- * We lost i_pino from now on.
- */
- set_cp_file(inode);
-
d_instantiate(dentry, inode);
return 0;
out: