Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 39370a503a6313233bf75732519ab9c76bb652ec..857141446d6b378cbdfcb09c8ec5b2df5c319d6d 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4379,8 +4379,11 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh,
        spin_unlock(&state_lock);
 
        if (status)
-               destroy_unhashed_deleg(dp);
+               goto out_unlock;
+
        return dp;
+out_unlock:
+       vfs_setlease(fp->fi_deleg_file, F_UNLCK, NULL, (void **)&dp);
 out_clnt_odstate:
        put_clnt_odstate(dp->dl_clnt_odstate);
 out_stid: