1 files changed, 3 insertions, 1 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e03e8efff53f..0cceb99705c9 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -410,7 +410,6 @@ static void nfs4_free_stid(struct kmem_cache *slab, struct nfs4_stid *s)
 void
 nfs4_put_delegation(struct nfs4_delegation *dp)
 {
-        remove_stid(&dp->dl_stid);
         if (atomic_dec_and_test(&dp->dl_count)) {
                 nfs4_free_stid(deleg_slab, &dp->dl_stid);
                 num_delegations--;
@@ -451,12 +450,14 @@ unhash_delegation(struct nfs4_delegation *dp)
 static void destroy_revoked_delegation(struct nfs4_delegation *dp)
 {
         list_del_init(&dp->dl_recall_lru);
+        remove_stid(&dp->dl_stid);
         nfs4_put_delegation(dp);
 }
 
 static void destroy_delegation(struct nfs4_delegation *dp)
 {
         unhash_delegation(dp);
+        remove_stid(&dp->dl_stid);
         nfs4_put_delegation(dp);
 }
 
@@ -3161,6 +3162,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh,
         open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
         return;
 out_free:
+        remove_stid(&dp->dl_stid);
         nfs4_put_delegation(dp);
 out_no_deleg:
         open->op_delegate_type = NFS4_OPEN_DELEGATE_NONE;