Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...

[firefly-linux-kernel-4.4.55.git] / fs / ext3 / xattr_security.c

diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index ea26f2acab942a7cb87eacf969dd5375b8d03e1f..722c2bf9645dc50e60267b9280f441cfc4b38d5b 100644 (file)
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -3,12 +3,8 @@
  * Handler for storing security labels as extended attributes.
  */
 
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/security.h>
+#include "ext3.h"
 #include "xattr.h"
 
 static size_t
@@ -47,8 +43,9 @@ ext3_xattr_security_set(struct dentry *dentry, const char *name,
                              name, value, size, flags);
 }
 
-int ext3_initxattrs(struct inode *inode, const struct xattr *xattr_array,
-                   void *fs_info)
+static int ext3_initxattrs(struct inode *inode,
+                          const struct xattr *xattr_array,
+                          void *fs_info)
 {
        const struct xattr *xattr;
        handle_t *handle = fs_info;