Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 54a92fd02bbd63b2d75543f59bd816b4d738e2e4..95b79672150ab7b6159b00e3ca4083b41eaca9c7 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -259,11 +259,14 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
        return rc;
 }
 
-int jffs2_check_acl(struct inode *inode, int mask)
+int jffs2_check_acl(struct inode *inode, int mask, unsigned int flags)
 {
        struct posix_acl *acl;
        int rc;
 
+       if (flags & IPERM_FLAG_RCU)
+               return -ECHILD;
+
        acl = jffs2_get_acl(inode, ACL_TYPE_ACCESS);
        if (IS_ERR(acl))
                return PTR_ERR(acl);