diff options
| author | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-15 18:41:17 -0400 |
| commit | a002951c97ff8da49938c982a4c236bf2fafdc9f (patch) | |
| tree | d43e7885ea7376df0a47a0fc8ceca66dc5bfa357 /fs/ocfs2/refcounttree.c | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
| parent | c151694b2c48d956ac8c8c59c6927f89cc29ef70 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/ocfs2/refcounttree.c')
| -rw-r--r-- | fs/ocfs2/refcounttree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 19ebc5aad391..35798b88042d 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c | |||
| @@ -4328,7 +4328,8 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir, | |||
| 4328 | 4328 | ||
| 4329 | /* If the security isn't preserved, we need to re-initialize them. */ | 4329 | /* If the security isn't preserved, we need to re-initialize them. */ |
| 4330 | if (!preserve) { | 4330 | if (!preserve) { |
| 4331 | error = ocfs2_init_security_and_acl(dir, new_orphan_inode); | 4331 | error = ocfs2_init_security_and_acl(dir, new_orphan_inode, |
| 4332 | &new_dentry->d_name); | ||
| 4332 | if (error) | 4333 | if (error) |
| 4333 | mlog_errno(error); | 4334 | mlog_errno(error); |
| 4334 | } | 4335 | } |