]> err.no Git - linux-2.6/commitdiff
NFSv4: Remove bogus call to nfs4_drop_state_owner() in _nfs4_open_expired()
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 5 Apr 2008 19:54:17 +0000 (15:54 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 19 Apr 2008 20:53:12 +0000 (16:53 -0400)
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>
fs/nfs/nfs4proc.c

index f38d0573be18cefe975ffb233f61bbe521c7910b..424aa206470f4b3d575229fbfe9ce4fd5ab2bbd0 100644 (file)
@@ -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;
 }