Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux

[mv-sheeva.git] / fs / ext3 / acl.c

diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 8a11fe212183529e225dee8a812264de5053b9d0..e4fa49e6c539310c2a4c67de8ae8fb7f647c7ec2 100644 (file)
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -240,10 +240,17 @@ ext3_set_acl(handle_t *handle, struct inode *inode, int type,
 }
 
 int
-ext3_check_acl(struct inode *inode, int mask)
+ext3_check_acl(struct inode *inode, int mask, unsigned int flags)
 {
-       struct posix_acl *acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);
+       struct posix_acl *acl;
+
+       if (flags & IPERM_FLAG_RCU) {
+               if (!negative_cached_acl(inode, ACL_TYPE_ACCESS))
+                       return -ECHILD;
+               return -EAGAIN;
+       }
 
+       acl = ext3_get_acl(inode, ACL_TYPE_ACCESS);
        if (IS_ERR(acl))
                return PTR_ERR(acl);
        if (acl) {