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); }