diff options
author | Vyacheslav Dubeyko <slava@dubeyko.com> | 2013-09-11 17:24:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:59:01 -0400 |
commit | b4c1107cc962613ea3572e5abba861a35d494b98 (patch) | |
tree | 9e83d6f00b37cb65a8e2f2ef435bead7b662c10f /fs/hfsplus/dir.c | |
parent | eef80d4ad1399067f26538a7dd56ff3df71e9278 (diff) |
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/dir.c')
-rw-r--r-- | fs/hfsplus/dir.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index d8ce4bd17fc5..4a4fea002673 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include "hfsplus_fs.h" | 16 | #include "hfsplus_fs.h" |
17 | #include "hfsplus_raw.h" | 17 | #include "hfsplus_raw.h" |
18 | #include "xattr.h" | 18 | #include "xattr.h" |
19 | #include "acl.h" | ||
19 | 20 | ||
20 | static inline void hfsplus_instantiate(struct dentry *dentry, | 21 | static inline void hfsplus_instantiate(struct dentry *dentry, |
21 | struct inode *inode, u32 cnid) | 22 | struct inode *inode, u32 cnid) |
@@ -529,6 +530,9 @@ const struct inode_operations hfsplus_dir_inode_operations = { | |||
529 | .getxattr = generic_getxattr, | 530 | .getxattr = generic_getxattr, |
530 | .listxattr = hfsplus_listxattr, | 531 | .listxattr = hfsplus_listxattr, |
531 | .removexattr = hfsplus_removexattr, | 532 | .removexattr = hfsplus_removexattr, |
533 | #ifdef CONFIG_HFSPLUS_FS_POSIX_ACL | ||
534 | .get_acl = hfsplus_get_posix_acl, | ||
535 | #endif | ||
532 | }; | 536 | }; |
533 | 537 | ||
534 | const struct file_operations hfsplus_dir_operations = { | 538 | const struct file_operations hfsplus_dir_operations = { |