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/ext3/acl.c | |
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/ext3/acl.c')
-rw-r--r-- | fs/ext3/acl.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c index a9fdd77d4b58..6c29bf0df04a 100644 --- a/fs/ext3/acl.c +++ b/fs/ext3/acl.c | |||
@@ -131,7 +131,7 @@ fail: | |||
131 | * | 131 | * |
132 | * inode->i_mutex: don't care | 132 | * inode->i_mutex: don't care |
133 | */ | 133 | */ |
134 | static struct posix_acl * | 134 | struct posix_acl * |
135 | ext3_get_acl(struct inode *inode, int type) | 135 | ext3_get_acl(struct inode *inode, int type) |
136 | { | 136 | { |
137 | int name_index; | 137 | int name_index; |
@@ -239,23 +239,6 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type, | |||
239 | return error; | 239 | return error; |
240 | } | 240 | } |
241 | 241 | ||
242 | int | ||
243 | ext3_check_acl(struct inode *inode, int mask) | ||
244 | { | ||
245 | struct posix_acl *acl; | ||
246 | |||
247 | acl = ext3_get_acl(inode, ACL_TYPE_ACCESS); | ||
248 | if (IS_ERR(acl)) | ||
249 | return PTR_ERR(acl); | ||
250 | if (acl) { | ||
251 | int error = posix_acl_permission(inode, acl, mask); | ||
252 | posix_acl_release(acl); | ||
253 | return error; | ||
254 | } | ||
255 | |||
256 | return -EAGAIN; | ||
257 | } | ||
258 | |||
259 | /* | 242 | /* |
260 | * Initialize the ACLs of a new inode. Called from ext3_new_inode. | 243 | * Initialize the ACLs of a new inode. Called from ext3_new_inode. |
261 | * | 244 | * |