2 files changed, 5 insertions, 9 deletions

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 2922b90ceac1..9b0d4b78b4fb 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 6938d8c68d6e..7ba083eb62bd 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) {