[pnfs] [PATCH 20/23] 2.6-latest pnfs client cancel ds renewd

[andros at umich.edu]

From: Andy Adamson <andros at umich.edu>

---
 fs/nfs/nfs4filelayoutdev.c |    4 ++++
 fs/nfs/nfs4proc.c          |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 89a4e1e..8cac969 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -217,6 +217,10 @@ nfs4_pnfs_ds_create(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds)
 		goto out;
 
 	clp = tmp.nfs_client;
+
+	/* data servers don't renew state */
+	cancel_delayed_work(&clp->cl_renewd);
+
 	err = nfs4_init_session(clp, &clp->cl_ds_session, clp->cl_rpcclient);
 	if (err)
 		goto out_put;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 84f1bc7..cef988f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3231,6 +3231,7 @@ void nfs41_sequence_call_done(struct rpc_task *task, void *data)
 			case -NFS4ERR_RETRY_UNCACHED_REP:
 			case -NFS4ERR_TOO_MANY_OPS:
 			case -NFS4ERR_OP_NOT_IN_SESSION:
+				dprintk("%s calling recover_session clp %p session %p\n", __func__, clp, session);
 				nfs41_recover_session(clp, session);
 		}
 	}
-- 
1.5.0.2