1 files changed, 9 insertions, 7 deletions

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 6101f955f231..ca557e677d9e 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -77,16 +77,18 @@ nfs4_renew_state(struct work_struct *work)
         /* Are we close to a lease timeout? */
         if (time_after(now, last + lease/3)) {
                 cred = nfs4_get_renew_cred_locked(clp);
+                spin_unlock(&clp->cl_lock);
                 if (cred == NULL) {
-                        set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
-                        spin_unlock(&clp->cl_lock);
+                        if (list_empty(&clp->cl_delegations)) {
+                                set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
+                                goto out;
+                        }
                         nfs_expire_all_delegations(clp);
-                        goto out;
+                } else {
+                        /* Queue an asynchronous RENEW. */
+                        nfs4_proc_async_renew(clp, cred);
+                        put_rpccred(cred);
                 }
-                spin_unlock(&clp->cl_lock);
-                /* Queue an asynchronous RENEW. */
-                nfs4_proc_async_renew(clp, cred);
-                put_rpccred(cred);
                 timeout = (2 * lease) / 3;
                 spin_lock(&clp->cl_lock);
         } else