aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorTao Ma <tao.ma@oracle.com>2009-12-18 10:24:55 +0800
committerJoel Becker <joel.becker@oracle.com>2009-12-18 13:32:28 -0800
commit10cf1a02f444fdcd50be47cce3fa8bf08251dd9c (patch)
tree88e014a00955835988b7bc39a388846ebb0a778a /fs/ocfs2
parentc7d260afcbc0f9f4074e74796d4e3646875c08e1 (diff)
downloadkernel_samsung_tuna-10cf1a02f444fdcd50be47cce3fa8bf08251dd9c.zip
kernel_samsung_tuna-10cf1a02f444fdcd50be47cce3fa8bf08251dd9c.tar.gz
kernel_samsung_tuna-10cf1a02f444fdcd50be47cce3fa8bf08251dd9c.tar.bz2
ocfs2: Set i_nlink properly during reflink.
We create a file in orphan dir for reflink so that if there is any error, we don't create any wrong dentry in the dir. But actually the file in orphan dir should be i_nlink = 0 so that it can be replayed and freed successfully. This patch first set i_nlink to 0 when creating the file in orphan dir and then set it to 1(reflink now only works for regular file) when we move it to the dest dir. Signed-off-by: Tao Ma <tao.ma@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/namei.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 5ac4d52..3e9b46002 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -2108,6 +2108,7 @@ int ocfs2_create_inode_in_orphan(struct inode *dir,
}
did_quota_inode = 1;
+ inode->i_nlink = 0;
/* do the real work now. */
status = ocfs2_mknod_locked(osb, dir, inode,
0, &new_di_bh, parent_di_bh, handle,
@@ -2268,6 +2269,8 @@ int ocfs2_mv_orphaned_inode_to_new(struct inode *dir,
di = (struct ocfs2_dinode *)di_bh->b_data;
le32_add_cpu(&di->i_flags, -OCFS2_ORPHANED_FL);
di->i_orphaned_slot = 0;
+ inode->i_nlink = 1;
+ ocfs2_set_links_count(di, inode->i_nlink);
ocfs2_journal_dirty(handle, di_bh);
status = ocfs2_add_entry(handle, dentry, inode,