3 files changed, 7 insertions, 3 deletions

diff --git a/fs/inode.c b/fs/inode.c
index f5c04dd9ae8a..abf77471e6c4 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -133,7 +133,6 @@ static struct inode *alloc_inode(struct super_block *sb)
                 inode->i_bdev = NULL;
                 inode->i_cdev = NULL;
                 inode->i_rdev = 0;
-                inode->i_security = NULL;
                 inode->dirtied_when = 0;
                 if (security_inode_alloc(inode)) {
                         if (inode->i_sb->s_op->destroy_inode)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4caec6cebc42..6eafbe309483 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -553,7 +553,9 @@ struct inode {
         unsigned int            i_flags;
 
         atomic_t                i_writecount;
+#ifdef CONFIG_SECURITY
         void                    *i_security;
+#endif
         void                    *i_private; /* fs or device private pointer */
 #ifdef __NEED_I_SIZE_ORDERED
         seqcount_t              i_size_seqcount;
@@ -645,7 +647,6 @@ struct fown_struct {
         rwlock_t lock;          /* protects pid, uid, euid fields */
         int pid;                /* pid or -pgrp where SIGIO should be sent */
         uid_t uid, euid;        /* uid/euid of process setting the owner */
-        void *security;
         int signum;             /* posix.1b rt signal to be delivered on IO */
 };
 
@@ -688,8 +689,9 @@ struct file {
         struct file_ra_state    f_ra;
 
         unsigned long           f_version;
+#ifdef CONFIG_SECURITY
         void                    *f_security;
-
+#endif
         /* needed for tty driver, and maybe others */
         void                    *private_data;
 
@@ -877,7 +879,9 @@ struct super_block {
         int                     s_syncing;
         int                     s_need_sync_fs;
         atomic_t                s_active;
+#ifdef CONFIG_SECURITY
         void                    *s_security;
+#endif
         struct xattr_handler    **s_xattr;
 
         struct list_head        s_inodes;       /* all inodes */
diff --git a/include/linux/security.h b/include/linux/security.h
index 9f56fb8a4a6c..9b5fea81f55e 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1595,6 +1595,7 @@ static inline void security_sb_post_pivotroot (struct nameidata *old_nd,
 
 static inline int security_inode_alloc (struct inode *inode)
 {
+        inode->i_security = NULL;
         return security_ops->inode_alloc_security (inode);
 }