From 10472f0deec320505bc46c7ad69b2b7ba9bd7743 Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Fri, 3 Feb 2006 08:21:12 -0500 Subject: [PATCH] --- yaml --- r: 19759 b: refs/heads/master c: 53ea68ecea11bcbb3451c2758ce181bd97b569a9 h: refs/heads/master i: 19757: bf45ed839adb41c193f5bb8edcf7ba91140ef9fb 19755: 7ea3b174b586178f211e4b045758b2ab2a1de3e7 19751: 2a03e07902c40c5dc9fba68dc243ba1451bcd0e3 19743: d38e4631e9383cd048344b6ae5dd7b3bef924cca v: v3 --- [refs] | 2 +- trunk/include/linux/security.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e271a01238c7..ed0cd24cd7d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 +refs/heads/master: 53ea68ecea11bcbb3451c2758ce181bd97b569a9 diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index bb1da86747c7..7cbef482e13a 100644 --- a/trunk/include/linux/security.h +++ b/trunk/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); }