diff options
Diffstat (limited to 'fs/hfsplus/xattr_security.c')
-rw-r--r-- | fs/hfsplus/xattr_security.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c index 83b842f113c5..00722765ea79 100644 --- a/fs/hfsplus/xattr_security.c +++ b/fs/hfsplus/xattr_security.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/security.h> | 9 | #include <linux/security.h> |
10 | #include "hfsplus_fs.h" | 10 | #include "hfsplus_fs.h" |
11 | #include "xattr.h" | 11 | #include "xattr.h" |
12 | #include "acl.h" | ||
12 | 13 | ||
13 | static int hfsplus_security_getxattr(struct dentry *dentry, const char *name, | 14 | static int hfsplus_security_getxattr(struct dentry *dentry, const char *name, |
14 | void *buffer, size_t size, int type) | 15 | void *buffer, size_t size, int type) |
@@ -96,6 +97,18 @@ int hfsplus_init_security(struct inode *inode, struct inode *dir, | |||
96 | &hfsplus_initxattrs, NULL); | 97 | &hfsplus_initxattrs, NULL); |
97 | } | 98 | } |
98 | 99 | ||
100 | int hfsplus_init_inode_security(struct inode *inode, | ||
101 | struct inode *dir, | ||
102 | const struct qstr *qstr) | ||
103 | { | ||
104 | int err; | ||
105 | |||
106 | err = hfsplus_init_posix_acl(inode, dir); | ||
107 | if (!err) | ||
108 | err = hfsplus_init_security(inode, dir, qstr); | ||
109 | return err; | ||
110 | } | ||
111 | |||
99 | const struct xattr_handler hfsplus_xattr_security_handler = { | 112 | const struct xattr_handler hfsplus_xattr_security_handler = { |
100 | .prefix = XATTR_SECURITY_PREFIX, | 113 | .prefix = XATTR_SECURITY_PREFIX, |
101 | .list = hfsplus_security_listxattr, | 114 | .list = hfsplus_security_listxattr, |