summaryrefslogtreecommitdiff
path: root/fs/ext4/xattr_security.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-01-10 20:54:07 +0400
committerTheodore Ts'o <tytso@mit.edu>2012-01-10 20:54:07 +0400
commitff9cb1c4eead5e4c292e75cd3170a82d66944101 (patch)
treecdb132a39e550a9b7b28ea67544cb86cd6ebdb6e /fs/ext4/xattr_security.c
parente4e11180dfa545233e5145919b75b7fac88638df (diff)
parentd50f2ab6f050311dbf7b8f5501b25f0bf64a439b (diff)
downloadlinux-ff9cb1c4eead5e4c292e75cd3170a82d66944101.tar.xz
Merge branch 'for_linus' into for_linus_merged
Conflicts: fs/ext4/ioctl.c
Diffstat (limited to 'fs/ext4/xattr_security.c')
-rw-r--r--fs/ext4/xattr_security.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index b60f9f81e33c..d2a200624af5 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -47,8 +47,9 @@ ext4_xattr_security_set(struct dentry *dentry, const char *name,
name, value, size, flags);
}
-int ext4_initxattrs(struct inode *inode, const struct xattr *xattr_array,
- void *fs_info)
+static int
+ext4_initxattrs(struct inode *inode, const struct xattr *xattr_array,
+ void *fs_info)
{
const struct xattr *xattr;
handle_t *handle = fs_info;