diff options
| author | Christoph Hellwig <hch@lst.de> | 2011-07-23 17:37:03 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:25:38 -0400 |
| commit | 4482a087d4c5a6ffbc385c56b4a4e2f694d9fd5d (patch) | |
| tree | 10ca7beda590618be3c695720e04582c63a03822 | |
| parent | 6311b10800a4bdc3f2c85d01fb113cf49bb83770 (diff) | |
| download | linux-3.10-4482a087d4c5a6ffbc385c56b4a4e2f694d9fd5d.tar.gz linux-3.10-4482a087d4c5a6ffbc385c56b4a4e2f694d9fd5d.tar.bz2 linux-3.10-4482a087d4c5a6ffbc385c56b4a4e2f694d9fd5d.zip | |
reiserfs: cache negative ACLs for v1 stat format
Always set up a negative ACL cache entry if the inode can't have ACLs.
That behaves much better than doing this check inside ->check_acl.
Also remove the left over MAY_NOT_BLOCK check.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/reiserfs/inode.c | 5 | ||||
| -rw-r--r-- | fs/reiserfs/xattr.c | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 2922b90ceac..9b0d4b78b4f 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -1475,6 +1475,11 @@ void reiserfs_read_locked_inode(struct inode *inode, reiserfs_check_path(&path_to_sd); /* init inode should be relsing */ + /* + * Stat data v1 doesn't support ACLs. + */ + if (get_inode_sd_version(inode) == STAT_DATA_V1) + cache_no_acl(inode); } /** diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 6938d8c68d6..7ba083eb62b 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -872,15 +872,6 @@ int reiserfs_check_acl(struct inode *inode, int mask) struct posix_acl *acl; int error = -EAGAIN; /* do regular unix permission checks by default */ - /* - * Stat data v1 doesn't support ACLs. - */ - if (get_inode_sd_version(inode) == STAT_DATA_V1) - return -EAGAIN; - - if (mask & MAY_NOT_BLOCK) - return -ECHILD; - acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS); if (acl) { |