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/ctree.h | |
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/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 54ab86127f7a..7506825211a2 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -3899,20 +3899,17 @@ do { \ | |||
3899 | /* acl.c */ | 3899 | /* acl.c */ |
3900 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL | 3900 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL |
3901 | struct posix_acl *btrfs_get_acl(struct inode *inode, int type); | 3901 | struct posix_acl *btrfs_get_acl(struct inode *inode, int type); |
3902 | int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); | ||
3902 | int btrfs_init_acl(struct btrfs_trans_handle *trans, | 3903 | int btrfs_init_acl(struct btrfs_trans_handle *trans, |
3903 | struct inode *inode, struct inode *dir); | 3904 | struct inode *inode, struct inode *dir); |
3904 | int btrfs_acl_chmod(struct inode *inode); | ||
3905 | #else | 3905 | #else |
3906 | #define btrfs_get_acl NULL | 3906 | #define btrfs_get_acl NULL |
3907 | #define btrfs_set_acl NULL | ||
3907 | static inline int btrfs_init_acl(struct btrfs_trans_handle *trans, | 3908 | static inline int btrfs_init_acl(struct btrfs_trans_handle *trans, |
3908 | struct inode *inode, struct inode *dir) | 3909 | struct inode *inode, struct inode *dir) |
3909 | { | 3910 | { |
3910 | return 0; | 3911 | return 0; |
3911 | } | 3912 | } |
3912 | static inline int btrfs_acl_chmod(struct inode *inode) | ||
3913 | { | ||
3914 | return 0; | ||
3915 | } | ||
3916 | #endif | 3913 | #endif |
3917 | 3914 | ||
3918 | /* relocation.c */ | 3915 | /* relocation.c */ |