diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:45:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:45:22 +1000 |
| commit | 8b41188898cf6c290883a848f9a03df9914bf3b8 (patch) | |
| tree | c800a88a9d5f8aa3e8de947d6e17a9d173449ba6 /security | |
| parent | b65d13626584a23a0fdc36f6e1f6db8a69aa5f9e (diff) | |
| parent | 7b1c7dec9ef1ac8742721a2d7bbb8ff3304cb816 (diff) | |
Merge commit 'ocfs2/linux-next'
Diffstat (limited to 'security')
| -rw-r--r-- | security/capability.c | 7 | ||||
| -rw-r--r-- | security/security.c | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/security/capability.c b/security/capability.c index fce07a7bc825..c6f690156a54 100644 --- a/security/capability.c +++ b/security/capability.c @@ -172,6 +172,12 @@ static int cap_inode_symlink(struct inode *inode, struct dentry *dentry, return 0; } +static int cap_inode_reflink(struct dentry *old_dentry, struct inode *inode, + bool preserve) +{ + return 0; +} + static int cap_inode_mkdir(struct inode *inode, struct dentry *dentry, int mask) { @@ -947,6 +953,7 @@ void security_fixup_ops(struct security_operations *ops) set_to_cap_if_null(ops, inode_link); set_to_cap_if_null(ops, inode_unlink); set_to_cap_if_null(ops, inode_symlink); + set_to_cap_if_null(ops, inode_reflink); set_to_cap_if_null(ops, inode_mkdir); set_to_cap_if_null(ops, inode_rmdir); set_to_cap_if_null(ops, inode_mknod); diff --git a/security/security.c b/security/security.c index c4c673240c1c..8cd6db94b676 100644 --- a/security/security.c +++ b/security/security.c @@ -467,6 +467,14 @@ int security_inode_symlink(struct inode *dir, struct dentry *dentry, return security_ops->inode_symlink(dir, dentry, old_name); } +int security_inode_reflink(struct dentry *old_dentry, struct inode *dir, + bool preserve) +{ + if (unlikely(IS_PRIVATE(old_dentry->d_inode))) + return 0; + return security_ops->inode_reflink(old_dentry, dir, preserve); +} + int security_inode_mkdir(struct inode *dir, struct dentry *dentry, int mode) { if (unlikely(IS_PRIVATE(dir))) |