[pnfs] [PATCH 22/29] pnfs: cancel ds renewd

[Benny Halevy]

From: Andy Adamson <andros at umich.edu>

Signed-off-by: Andy Adamson<andros at umich.edu>
Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4filelayoutdev.c |    4 ++++
 fs/nfs/nfs4proc.c          |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 7430658..9d38cc8 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -215,6 +215,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 7613841..63db97d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4977,6 +4977,8 @@ 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.3.3