[pnfs] [PATCH 03/11] nfs41: test expired session in nfs4_setup_sequence before recovery

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4proc.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 3a97d1e..865984c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -410,10 +410,12 @@ static int nfs4_setup_sequence(struct nfs_client *clp,
 		__func__, clp, session, clp->cl_minorversion);
 	switch (clp->cl_minorversion) {
 	case 1:
-		ret = nfs41_recover_expired_session(task, clp, session);
-		if (ret) {
-			memset(res, 0, sizeof(*res));
-			break;
+		if (nfs41_test_session_expired(session)) {
+			ret = nfs41_recover_expired_session(task, clp, session);
+			if (ret) {
+				memset(res, 0, sizeof(*res));
+				break;
+			}
 		}
 		ret = nfs41_setup_sequence(session, args,
 				res, cache_reply, task);
-- 
1.5.3.3