From 207261db036d5229fe03a39fc062c685c110b2e3 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 5 Jul 2006 13:05:13 -0400
Subject: [PATCH] --- yaml --- r: 32121 b: refs/heads/master c:
 4e0641a7ad98fca5646a6be17605bc80f6c4ebde h: refs/heads/master i:   32119:
 6888365090b4ee12f4cb78addb69aa27a0397152 v: v3

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

diff --git a/[refs] b/[refs]
index 2a78eed75c2f..751255ae31fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bce3481c91801665e17f8daf59ede946129f3d3f
+refs/heads/master: 4e0641a7ad98fca5646a6be17605bc80f6c4ebde
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index 3ddda6f7ecc2..e7ffb4deb3e5 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -690,7 +690,9 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
 			goto out_force;
 		/* This is an open(2) */
 		if (nfs_lookup_check_intent(nd, LOOKUP_OPEN) != 0 &&
-				!(server->flags & NFS_MOUNT_NOCTO))
+				!(server->flags & NFS_MOUNT_NOCTO) &&
+				(S_ISREG(inode->i_mode) ||
+				 S_ISDIR(inode->i_mode)))
 			goto out_force;
 	}
 	return nfs_revalidate_inode(server, inode);