1 files changed, 8 insertions, 6 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 04baee4327b2..4cc86001220a 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2385,9 +2385,10 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
         return ret;
 }
 
-static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state)
+static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state,
+                const nfs4_stateid *stateid)
 {
-        nfs_remove_bad_delegation(state->inode);
+        nfs_remove_bad_delegation(state->inode, stateid);
         write_seqlock(&state->seqlock);
         nfs4_stateid_copy(&state->stateid, &state->open_stateid);
         write_sequnlock(&state->seqlock);
@@ -2397,7 +2398,7 @@ static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state)
 static void nfs40_clear_delegation_stateid(struct nfs4_state *state)
 {
         if (rcu_access_pointer(NFS_I(state->inode)->delegation) != NULL)
-                nfs_finish_clear_delegation_stateid(state);
+                nfs_finish_clear_delegation_stateid(state, NULL);
 }
 
 static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state)
@@ -2443,19 +2444,20 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
                 rcu_read_unlock();
                 return;
         }
+
+        nfs4_stateid_copy(&stateid, &delegation->stateid);
         if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
                 rcu_read_unlock();
-                nfs_finish_clear_delegation_stateid(state);
+                nfs_finish_clear_delegation_stateid(state, &stateid);
                 return;
         }
 
-        nfs4_stateid_copy(&stateid, &delegation->stateid);
         cred = get_rpccred(delegation->cred);
         rcu_read_unlock();
         status = nfs41_test_and_free_expired_stateid(server, &stateid, cred);
         trace_nfs4_test_delegation_stateid(state, NULL, status);
         if (status != NFS_OK)
-                nfs_finish_clear_delegation_stateid(state);
+                nfs_finish_clear_delegation_stateid(state, &stateid);
 
         put_rpccred(cred);
 }