diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /security/security.c | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 59f23b5918b3..ff7068727757 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -429,11 +429,11 @@ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) | |||
429 | return security_ops->inode_follow_link(dentry, nd); | 429 | return security_ops->inode_follow_link(dentry, nd); |
430 | } | 430 | } |
431 | 431 | ||
432 | int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd) | 432 | int security_inode_permission(struct inode *inode, int mask) |
433 | { | 433 | { |
434 | if (unlikely(IS_PRIVATE(inode))) | 434 | if (unlikely(IS_PRIVATE(inode))) |
435 | return 0; | 435 | return 0; |
436 | return security_ops->inode_permission(inode, mask, nd); | 436 | return security_ops->inode_permission(inode, mask); |
437 | } | 437 | } |
438 | 438 | ||
439 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | 439 | int security_inode_setattr(struct dentry *dentry, struct iattr *attr) |
@@ -442,6 +442,7 @@ int security_inode_setattr(struct dentry *dentry, struct iattr *attr) | |||
442 | return 0; | 442 | return 0; |
443 | return security_ops->inode_setattr(dentry, attr); | 443 | return security_ops->inode_setattr(dentry, attr); |
444 | } | 444 | } |
445 | EXPORT_SYMBOL_GPL(security_inode_setattr); | ||
445 | 446 | ||
446 | int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) | 447 | int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry) |
447 | { | 448 | { |