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@xxxxxx>
Index: linux-2.6/fs/reiserfs/inode.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/inode.c 2011-07-23 16:39:07.214083201 +0200
+++ linux-2.6/fs/reiserfs/inode.c 2011-07-23 16:39:41.154082998 +0200
@@ -1475,6 +1475,11 @@ void reiserfs_read_locked_inode(struct i
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);
}
/**
Index: linux-2.6/fs/reiserfs/xattr.c
===================================================================
--- linux-2.6.orig/fs/reiserfs/xattr.c 2011-07-23 16:39:07.230749867 +0200
+++ linux-2.6/fs/reiserfs/xattr.c 2011-07-23 16:39:41.157416331 +0200
@@ -872,15 +872,6 @@ int reiserfs_check_acl(struct inode *ino
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) {
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
