diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-04-05 15:54:17 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-04-19 16:53:12 -0400 |
commit | 35d05778e25ee16dbddb60331be0bc1309efba19 (patch) | |
tree | 81997edb4131763212dfba51ae4d94518decfef2 | |
parent | dbae4c73f08b8a7980cc912954ade3d4c1fb6147 (diff) |
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>
-rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f38d0573be18..424aa206470f 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 | |||
982 | if (IS_ERR(opendata)) | 982 | if (IS_ERR(opendata)) |
983 | return PTR_ERR(opendata); | 983 | return PTR_ERR(opendata); |
984 | ret = nfs4_open_recover(opendata, state); | 984 | ret = nfs4_open_recover(opendata, state); |
985 | if (ret == -ESTALE) { | 985 | if (ret == -ESTALE) |
986 | /* Invalidate the state owner so we don't ever use it again */ | ||
987 | nfs4_drop_state_owner(state->owner); | ||
988 | d_drop(ctx->path.dentry); | 986 | d_drop(ctx->path.dentry); |
989 | } | ||
990 | nfs4_opendata_put(opendata); | 987 | nfs4_opendata_put(opendata); |
991 | return ret; | 988 | return ret; |
992 | } | 989 | } |