diff options
Diffstat (limited to 'fs/9p/acl.c')
-rw-r--r-- | fs/9p/acl.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c index 075bc909da17..814be079c185 100644 --- a/fs/9p/acl.c +++ b/fs/9p/acl.c | |||
@@ -96,7 +96,7 @@ static struct posix_acl *v9fs_get_cached_acl(struct inode *inode, int type) | |||
96 | return acl; | 96 | return acl; |
97 | } | 97 | } |
98 | 98 | ||
99 | int v9fs_check_acl(struct inode *inode, int mask) | 99 | struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type) |
100 | { | 100 | { |
101 | struct posix_acl *acl; | 101 | struct posix_acl *acl; |
102 | struct v9fs_session_info *v9ses; | 102 | struct v9fs_session_info *v9ses; |
@@ -108,18 +108,10 @@ int v9fs_check_acl(struct inode *inode, int mask) | |||
108 | * On access = client and acl = on mode get the acl | 108 | * On access = client and acl = on mode get the acl |
109 | * values from the server | 109 | * values from the server |
110 | */ | 110 | */ |
111 | return -EAGAIN; | 111 | return NULL; |
112 | } | 112 | } |
113 | acl = v9fs_get_cached_acl(inode, ACL_TYPE_ACCESS); | 113 | return v9fs_get_cached_acl(inode, type); |
114 | 114 | ||
115 | if (IS_ERR(acl)) | ||
116 | return PTR_ERR(acl); | ||
117 | if (acl) { | ||
118 | int error = posix_acl_permission(inode, acl, mask); | ||
119 | posix_acl_release(acl); | ||
120 | return error; | ||
121 | } | ||
122 | return -EAGAIN; | ||
123 | } | 115 | } |
124 | 116 | ||
125 | static int v9fs_set_acl(struct dentry *dentry, int type, struct posix_acl *acl) | 117 | static int v9fs_set_acl(struct dentry *dentry, int type, struct posix_acl *acl) |