From 7c72c7370af3e0fdcb4d1f81b7faab173830ec47 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Wed, 26 Sep 2012 15:25:52 -0400 Subject: [PATCH] --- yaml --- r: 333155 b: refs/heads/master c: 6938867edba929a65a167a97581231e76aeb10b4 h: refs/heads/master i: 333153: 5fe5040a464c182d39467a2a013f5470c1b86538 333151: c2f45f307d92048dbe9da36498063da1bd4513a3 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c3b1d97a5393..0b32143908e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcb6d9c6b719b633e9b98d26d8a7937209e8bf21 +refs/heads/master: 6938867edba929a65a167a97581231e76aeb10b4 diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 755ee162ee7e..471a75f11ea2 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -1774,7 +1774,11 @@ static void nfs41_clear_delegation_stateid(struct nfs4_state *state) * informs us the stateid is unrecognized. */ if (status != -NFS4ERR_BAD_STATEID) nfs41_free_stateid(server, stateid); + nfs_remove_bad_delegation(state->inode); + write_seqlock(&state->seqlock); + nfs4_stateid_copy(&state->stateid, &state->open_stateid); + write_sequnlock(&state->seqlock); clear_bit(NFS_DELEGATED_STATE, &state->flags); } }