NFSv4: Send RENEW requests to the server only when we're holding state

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index a3001628ad32..f62c2f7a4ffb 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -54,6 +54,7 @@
 #include <linux/nfs4.h>
 #include <linux/nfs_fs.h>
 #include "nfs4_fs.h"
+#include "delegation.h"
 
 #define NFSDBG_FACILITY NFSDBG_PROC
 
@@ -68,7 +69,7 @@ nfs4_renew_state(void *data)
         dprintk("%s: start\n", __FUNCTION__);
         /* Are there any active superblocks? */
         if (list_empty(&clp->cl_superblocks))
-                goto out; 
+                goto out;
         spin_lock(&clp->cl_lock);
         lease = clp->cl_lease_time;
         last = clp->cl_last_renewal;
@@ -76,6 +77,12 @@ nfs4_renew_state(void *data)
         timeout = (2 * lease) / 3 + (long)last - (long)now;
         /* Are we close to a lease timeout? */
         if (time_after(now, last + lease/3)) {
+                if (list_empty(&clp->cl_state_owners)) {
+                        set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
+                        spin_unlock(&clp->cl_lock);
+                        nfs_expire_all_delegations(clp);
+                        goto out;
+                }
                 spin_unlock(&clp->cl_lock);
                 /* Queue an asynchronous RENEW. */
                 nfs4_proc_async_renew(clp);