summaryrefslogtreecommitdiff
path: root/fs/hfsplus/xattr_security.c
diff options
context:
space:
mode:
authorVyacheslav Dubeyko <slava@dubeyko.com>2013-09-11 14:24:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-11 15:59:01 -0700
commitb4c1107cc962613ea3572e5abba861a35d494b98 (patch)
tree9e83d6f00b37cb65a8e2f2ef435bead7b662c10f /fs/hfsplus/xattr_security.c
parenteef80d4ad1399067f26538a7dd56ff3df71e9278 (diff)
downloadlinux-b4c1107cc962613ea3572e5abba861a35d494b98.tar.gz
linux-b4c1107cc962613ea3572e5abba861a35d494b98.tar.xz
hfsplus: integrate POSIX ACLs support into driver
Integrate implemented POSIX ACLs support into hfsplus driver. Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@infradead.org> Cc: Hin-Tak Leung <htl10@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hfsplus/xattr_security.c')
-rw-r--r--fs/hfsplus/xattr_security.c13
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 @@
#include <linux/security.h>
#include "hfsplus_fs.h"
#include "xattr.h"
+#include "acl.h"
static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
void *buffer, size_t size, int type)
@@ -96,6 +97,18 @@ int hfsplus_init_security(struct inode *inode, struct inode *dir,
&hfsplus_initxattrs, NULL);
}
+int hfsplus_init_inode_security(struct inode *inode,
+ struct inode *dir,
+ const struct qstr *qstr)
+{
+ int err;
+
+ err = hfsplus_init_posix_acl(inode, dir);
+ if (!err)
+ err = hfsplus_init_security(inode, dir, qstr);
+ return err;
+}
+
const struct xattr_handler hfsplus_xattr_security_handler = {
.prefix = XATTR_SECURITY_PREFIX,
.list = hfsplus_security_listxattr,