diff options
author | Christoph Hellwig <hch@infradead.org> | 2013-12-20 08:16:44 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-01-25 23:58:19 -0500 |
commit | 64e178a7118b1cf7648391755e44dcc209091003 (patch) | |
tree | f06ee5408a04ee86c7a79dfd885aaab3c5f3f070 /fs/ext3/acl.h | |
parent | 996a710d46418cacb5b4a519ab9341a74066551d (diff) |
ext2/3/4: use generic posix ACL infrastructure
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext3/acl.h')
-rw-r--r-- | fs/ext3/acl.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h index dbc921e458c5..ea1c69edab9e 100644 --- a/fs/ext3/acl.h +++ b/fs/ext3/acl.h | |||
@@ -55,18 +55,13 @@ static inline int ext3_acl_count(size_t size) | |||
55 | 55 | ||
56 | /* acl.c */ | 56 | /* acl.c */ |
57 | extern struct posix_acl *ext3_get_acl(struct inode *inode, int type); | 57 | extern struct posix_acl *ext3_get_acl(struct inode *inode, int type); |
58 | extern int ext3_acl_chmod (struct inode *); | 58 | extern int ext3_set_acl(struct inode *inode, struct posix_acl *acl, int type); |
59 | extern int ext3_init_acl (handle_t *, struct inode *, struct inode *); | 59 | extern int ext3_init_acl (handle_t *, struct inode *, struct inode *); |
60 | 60 | ||
61 | #else /* CONFIG_EXT3_FS_POSIX_ACL */ | 61 | #else /* CONFIG_EXT3_FS_POSIX_ACL */ |
62 | #include <linux/sched.h> | 62 | #include <linux/sched.h> |
63 | #define ext3_get_acl NULL | 63 | #define ext3_get_acl NULL |
64 | 64 | #define ext3_set_acl NULL | |
65 | static inline int | ||
66 | ext3_acl_chmod(struct inode *inode) | ||
67 | { | ||
68 | return 0; | ||
69 | } | ||
70 | 65 | ||
71 | static inline int | 66 | static inline int |
72 | ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) | 67 | ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) |