diff options
author | Christoph Hellwig <hch@lst.de> | 2011-07-23 11:37:31 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:30:23 -0400 |
commit | 4e34e719e457f2e031297175410fc0bd4016a085 (patch) | |
tree | ab969a371e0d2efc6bfbf503ca6cdfce3af3bf6c /fs/btrfs/ctree.h | |
parent | edde854e8bb34a7f32fa993d721f1da0faf64165 (diff) |
fs: take the ACL checks to common code
Replace the ->check_acl method with a ->get_acl method that simply reads an
ACL from disk after having a cache miss. This means we can replace the ACL
checking boilerplate code with a single implementation in namei.c.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 82be74efbb26..fe9287b06496 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -2645,9 +2645,9 @@ do { \ | |||
2645 | 2645 | ||
2646 | /* acl.c */ | 2646 | /* acl.c */ |
2647 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL | 2647 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL |
2648 | int btrfs_check_acl(struct inode *inode, int mask); | 2648 | struct posix_acl *btrfs_get_acl(struct inode *inode, int type); |
2649 | #else | 2649 | #else |
2650 | #define btrfs_check_acl NULL | 2650 | #define btrfs_get_acl NULL |
2651 | #endif | 2651 | #endif |
2652 | int btrfs_init_acl(struct btrfs_trans_handle *trans, | 2652 | int btrfs_init_acl(struct btrfs_trans_handle *trans, |
2653 | struct inode *inode, struct inode *dir); | 2653 | struct inode *inode, struct inode *dir); |