diff options
| author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 09:50:01 +0300 |
|---|---|---|
| committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 09:50:30 +0300 |
| commit | 258a5aa8dfc6294f5f7df892023ee4d3e57c9841 (patch) | |
| tree | 101a4b9ee97f7d838b35a906244085873c599d19 /fs/btrfs | |
| parent | 73598611ade7c85f0c3d52ba5130103f6709c6d3 (diff) | |
| download | linux-258a5aa8dfc6294f5f7df892023ee4d3e57c9841.tar.xz | |
btrfs: provide simple rcu-walk ACL implementation
This simple implementation just checks for no ACLs on the inode, and
if so, then the rcu-walk may proceed, otherwise fail it.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/acl.c | 21 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
2 files changed, 12 insertions, 12 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index cb518a4b917c..6ae2c8cac9d5 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -187,18 +187,21 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, int btrfs_check_acl(struct inode *inode, int mask, unsigned int flags) { - struct posix_acl *acl; int error = -EAGAIN; - if (flags & IPERM_FLAG_RCU) - return -ECHILD; + if (flags & IPERM_FLAG_RCU) { + if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) + error = -ECHILD; - acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); - if (IS_ERR(acl)) - return PTR_ERR(acl); - if (acl) { - error = posix_acl_permission(inode, acl, mask); - posix_acl_release(acl); + } else { + struct posix_acl *acl; + acl = btrfs_get_acl(inode, ACL_TYPE_ACCESS); + if (IS_ERR(acl)) + return PTR_ERR(acl); + if (acl) { + error = posix_acl_permission(inode, acl, mask); + posix_acl_release(acl); + } } return error; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5cf0db0081f9..a0ff46a47895 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7213,9 +7213,6 @@ static int btrfs_set_page_dirty(struct page *page) static int btrfs_permission(struct inode *inode, int mask, unsigned int flags) { - if (flags & IPERM_FLAG_RCU) - return -ECHILD; - if ((BTRFS_I(inode)->flags & BTRFS_INODE_READONLY) && (mask & MAY_WRITE)) return -EACCES; return generic_permission(inode, mask, flags, btrfs_check_acl); |