diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-31 13:31:23 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:46:06 -0500 |
commit | 5fa6300ae0ccf76018775ea16bc3a061cadc39a6 (patch) | |
tree | c3f8ade583a33039a057a6257edc5c8b57d5411d /fs/9p/acl.h | |
parent | be308f07964a597ea1806a0c02477a383b92f53a (diff) |
9p: split dropping the acls from v9fs_set_create_acl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p/acl.h')
-rw-r--r-- | fs/9p/acl.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/9p/acl.h b/fs/9p/acl.h index 3a609c57b6ea..cb7fc54081f7 100644 --- a/fs/9p/acl.h +++ b/fs/9p/acl.h | |||
@@ -19,9 +19,10 @@ extern int v9fs_get_acl(struct inode *, struct p9_fid *); | |||
19 | extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type); | 19 | extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type); |
20 | extern int v9fs_acl_chmod(struct inode *, struct p9_fid *); | 20 | extern int v9fs_acl_chmod(struct inode *, struct p9_fid *); |
21 | extern int v9fs_set_create_acl(struct dentry *, | 21 | extern int v9fs_set_create_acl(struct dentry *, |
22 | struct posix_acl **, struct posix_acl **); | 22 | struct posix_acl *, struct posix_acl *); |
23 | extern int v9fs_acl_mode(struct inode *dir, umode_t *modep, | 23 | extern int v9fs_acl_mode(struct inode *dir, umode_t *modep, |
24 | struct posix_acl **dpacl, struct posix_acl **pacl); | 24 | struct posix_acl **dpacl, struct posix_acl **pacl); |
25 | extern void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl); | ||
25 | #else | 26 | #else |
26 | #define v9fs_iop_get_acl NULL | 27 | #define v9fs_iop_get_acl NULL |
27 | static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid) | 28 | static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid) |
@@ -33,11 +34,15 @@ static inline int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid) | |||
33 | return 0; | 34 | return 0; |
34 | } | 35 | } |
35 | static inline int v9fs_set_create_acl(struct dentry *dentry, | 36 | static inline int v9fs_set_create_acl(struct dentry *dentry, |
36 | struct posix_acl **dpacl, | 37 | struct posix_acl *dacl, |
37 | struct posix_acl **pacl) | 38 | struct posix_acl *acl) |
38 | { | 39 | { |
39 | return 0; | 40 | return 0; |
40 | } | 41 | } |
42 | static inline void v9fs_put_acl(struct posix_acl *dacl, | ||
43 | struct posix_acl *acl) | ||
44 | { | ||
45 | } | ||
41 | static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep, | 46 | static inline int v9fs_acl_mode(struct inode *dir, umode_t *modep, |
42 | struct posix_acl **dpacl, | 47 | struct posix_acl **dpacl, |
43 | struct posix_acl **pacl) | 48 | struct posix_acl **pacl) |