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;