--- linux-next-20110720.orig/fs/overlayfs/inode.c
+++ linux-next-20110720/fs/overlayfs/inode.c
@@ -56,7 +56,7 @@ int ovl_permission(struct inode *inode,
 
 	if (S_ISDIR(inode->i_mode)) {
 		oe = inode->i_private;
-	} else if (flags & IPERM_FLAG_RCU) {
+	} else if (mask & MAY_NOT_BLOCK) {
 		return -ECHILD;
 	} else {
 		/*
@@ -79,7 +79,7 @@ int ovl_permission(struct inode *inode,
 	/* Careful in RCU walk mode */
 	realinode = ACCESS_ONCE(realdentry->d_inode);
 	if (!realinode) {
-		WARN_ON(!(flags & IPERM_FLAG_RCU));
+		WARN_ON(!(mask & MAY_NOT_BLOCK));
 		err = -ENOENT;
 		goto out_dput;
 	}