Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[karo-tx-linux.git] / fs / ext3 / xattr_security.c

diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index 3387664ad70e5bc3bbfbad03a2d934e98d0dda7b..722c2bf9645dc50e60267b9280f441cfc4b38d5b 100644 (file)
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -43,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;