diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 08:59:34 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 08:59:34 +0300 |
| commit | 725b2805fd5d729b0db59fe8fc992e97523782c7 (patch) | |
| tree | 04ca7c7ed6e918029898a6c5301488e60d0564d4 /include/linux/security.h | |
| parent | 9ac341ae799413708e674bc65c8a72c90dae8d34 (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
| download | linux-725b2805fd5d729b0db59fe8fc992e97523782c7.tar.xz | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index bb1da86747c7..7cbef482e13a 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1499,15 +1499,11 @@ static inline void security_sb_post_pivotroot (struct nameidata *old_nd, static inline int security_inode_alloc (struct inode *inode) { - if (unlikely (IS_PRIVATE (inode))) - return 0; return security_ops->inode_alloc_security (inode); } static inline void security_inode_free (struct inode *inode) { - if (unlikely (IS_PRIVATE (inode))) - return; security_ops->inode_free_security (inode); } |