From c2f16285b62b1c89aea029d4c60e58a06527ff99 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@kernel.dk>
Date: Fri, 14 Jan 2011 02:48:39 +0000
Subject: [PATCH] --- yaml --- r: 230862 b: refs/heads/master c:
 657e94b673a805b427903c5628e95348235fad06 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 22f1b6cf8536..3fb0fe2963fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6755988afc003a0332406a134fb6a1626f9b28
+refs/heads/master: 657e94b673a805b427903c5628e95348235fad06
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index d33da530097a..a0d8320bed9c 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1410,11 +1410,15 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
 static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
 	struct dentry *parent = NULL;
-	struct inode *inode = dentry->d_inode;
+	struct inode *inode;
 	struct inode *dir;
 	struct nfs_open_context *ctx;
 	int openflags, ret = 0;
 
+	if (nd->flags & LOOKUP_RCU)
+		return -ECHILD;
+
+	inode = dentry->d_inode;
 	if (!is_atomic_open(nd) || d_mountpoint(dentry))
 		goto no_open;