leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reiserfs: cache negative ACLs for v1 stat format

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2011-07-23 17:37:03 +02:00 committed by Al Viro
parent 6311b10800
commit 4482a087d4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/reiserfs/inode.c
View File

@ -1475,6 +1475,11 @@ void reiserfs_read_locked_inode(struct inode *inode,
reiserfs_check_path(&path_to_sd); /* init inode should be relsing */ 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);
} }
/** /**

9
fs/reiserfs/xattr.c
View File

@ -872,15 +872,6 @@ int reiserfs_check_acl(struct inode *inode, int mask)
struct posix_acl *acl; struct posix_acl *acl;
int error = -EAGAIN; /* do regular unix permission checks by default */ 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); acl = reiserfs_get_acl(inode, ACL_TYPE_ACCESS);
if (acl) { if (acl) {