From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 25 Mar 2010 17:51:05 +0000 (-0400)
Subject: NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
X-Git-Tag: v2.6.34-rc5~23^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=80e60639f1b7c121a7fea53920c5a4b94009361a;p=linux.git

NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index c6f2750648f4..be46f26c9a56 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1025,12 +1025,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
 				res = NULL;
 				goto out;
 			/* This turned out not to be a regular file */
+			case -EISDIR:
 			case -ENOTDIR:
 				goto no_open;
 			case -ELOOP:
 				if (!(nd->intent.open.flags & O_NOFOLLOW))
 					goto no_open;
-			/* case -EISDIR: */
 			/* case -EINVAL: */
 			default:
 				goto out;