From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 5 Apr 2008 19:54:17 +0000 (-0400)
Subject: NFSv4: Remove bogus call to nfs4_drop_state_owner() in _nfs4_open_expired()
X-Git-Tag: v2.6.26-rc1~1082^2^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35d05778e25ee16dbddb60331be0bc1309efba19;p=linux-2.6

NFSv4: Remove bogus call to nfs4_drop_state_owner() in _nfs4_open_expired()

There should be no need to invalidate a perfectly good state owner just
because of a stale filehandle. Doing so can cause the state recovery code
to break, since nfs4_get_renew_cred() and nfs4_get_setclientid_cred() rely
on finding active state owners.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f38d0573be..424aa20647 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -982,11 +982,8 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *s
 	if (IS_ERR(opendata))
 		return PTR_ERR(opendata);
 	ret = nfs4_open_recover(opendata, state);
-	if (ret == -ESTALE) {
-		/* Invalidate the state owner so we don't ever use it again */
-		nfs4_drop_state_owner(state->owner);
+	if (ret == -ESTALE)
 		d_drop(ctx->path.dentry);
-	}
 	nfs4_opendata_put(opendata);
 	return ret;
 }