diff options
| author | Christoph Hellwig <hch@lst.de> | 2011-07-23 15:37:31 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 18:30:23 (GMT) |
| commit | 4e34e719e457f2e031297175410fc0bd4016a085 (patch) | |
| tree | ab969a371e0d2efc6bfbf503ca6cdfce3af3bf6c /fs/ext4/acl.c | |
| parent | edde854e8bb34a7f32fa993d721f1da0faf64165 (diff) | |
| download | linux-4e34e719e457f2e031297175410fc0bd4016a085.tar.xz | |
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/ext4/acl.c')
| -rw-r--r-- | fs/ext4/acl.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index 7b094d1..dca2d1d 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -131,7 +131,7 @@ fail: * * inode->i_mutex: don't care */ -static struct posix_acl * +struct posix_acl * ext4_get_acl(struct inode *inode, int type) { int name_index; @@ -237,23 +237,6 @@ ext4_set_acl(handle_t *handle, struct inode *inode, int type, return error; } -int -ext4_check_acl(struct inode *inode, int mask) -{ - struct posix_acl *acl; - - acl = ext4_get_acl(inode, ACL_TYPE_ACCESS); - if (IS_ERR(acl)) - return PTR_ERR(acl); - if (acl) { - int error = posix_acl_permission(inode, acl, mask); - posix_acl_release(acl); - return error; - } - - return -EAGAIN; -} - /* * Initialize the ACLs of a new inode. Called from ext4_new_inode. * |