diff options
author | Christoph Hellwig <hch@infradead.org> | 2013-12-20 08:16:43 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-01-25 23:58:18 -0500 |
commit | 996a710d46418cacb5b4a519ab9341a74066551d (patch) | |
tree | c07492fe2387367b788adfd275e391602b2d9d81 /fs/btrfs/xattr.c | |
parent | 37bc15392a2363ca822b2c2828e0ccafbea32f75 (diff) |
btrfs: use generic posix ACL infrastructure
Also don't bother to set up a .get_acl method for symlinks as we do not
support access control (ACLs or even mode bits) for symlinks in Linux.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r-- | fs/btrfs/xattr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 05740b9789e4..3d1c301c9260 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/rwsem.h> | 22 | #include <linux/rwsem.h> |
23 | #include <linux/xattr.h> | 23 | #include <linux/xattr.h> |
24 | #include <linux/security.h> | 24 | #include <linux/security.h> |
25 | #include <linux/posix_acl_xattr.h> | ||
25 | #include "ctree.h" | 26 | #include "ctree.h" |
26 | #include "btrfs_inode.h" | 27 | #include "btrfs_inode.h" |
27 | #include "transaction.h" | 28 | #include "transaction.h" |
@@ -313,8 +314,8 @@ err: | |||
313 | */ | 314 | */ |
314 | const struct xattr_handler *btrfs_xattr_handlers[] = { | 315 | const struct xattr_handler *btrfs_xattr_handlers[] = { |
315 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL | 316 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL |
316 | &btrfs_xattr_acl_access_handler, | 317 | &posix_acl_access_xattr_handler, |
317 | &btrfs_xattr_acl_default_handler, | 318 | &posix_acl_default_xattr_handler, |
318 | #endif | 319 | #endif |
319 | NULL, | 320 | NULL, |
320 | }; | 321 | }; |