From 88cc60f5ba5cc61522183d3578c18a9b55e3f19b Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 22 Apr 2010 15:35:55 -0400
Subject: [PATCH] --- yaml --- r: 190391 b: refs/heads/master c:
 1f063d2cdf332a8a5722006b1345d15d16007c6e h: refs/heads/master i:   190389:
 45c054dc5eb84c9295f36711527c83dda35cbf1c   190387:
 06f493b59f248bf9779502740e1573ff05c04b21   190383:
 404beae3e1aad65a5acc084f823f3bed73e3b8fd v: v3

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

diff --git a/[refs] b/[refs]
index b5a8664afcd2..59860d5966d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d7b08945e54a3a5358d5890240619a013cb7388
+refs/heads/master: 1f063d2cdf332a8a5722006b1345d15d16007c6e
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index be46f26c9a56..fbb4cf79a20e 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1050,7 +1050,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd)
 	struct inode *dir;
 	int openflags, ret = 0;
 
-	if (!is_atomic_open(nd))
+	if (!is_atomic_open(nd) || d_mountpoint(dentry))
 		goto no_open;
 	parent = dget_parent(dentry);
 	dir = parent->d_inode;