---

yaml --- r: 258829 b: refs/heads/master c: 4482a08 h: refs/heads/master i: 258827: 9e15eec v: v3
git-mirror · Jul 25, 2011 · a09a834 · a09a834
1 parent fd1c34c
commit a09a834
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6311b10800a4bdc3f2c85d01fb113cf49bb83770
+refs/heads/master: 4482a087d4c5a6ffbc385c56b4a4e2f694d9fd5d
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/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/trunk/fs/reiserfs/xattr.c b/trunk/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) {