[RFC 45/85] nfs41: start session recovery from nfs4_setup_sequence

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Rahul Iyer <iyer@xxxxxxxxxx>
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
 fs/nfs/nfs4proc.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a4f5b15..12f3b9f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -491,8 +491,11 @@ int nfs4_setup_sequence(struct nfs_client *clp,
 	if (clp->cl_minorversion == 0 || res->sr_slot)
 		goto out;
 	BUG_ON(clp->cl_minorversion != 1);
-	ret = nfs41_setup_sequence(clp->cl_session, args, res,
-				   cache_reply, task);
+	if (nfs41_test_session_alloc(clp->cl_session))
+		ret = nfs41_recover_session_sync(clp->cl_session);
+	if (!ret)
+		ret = nfs41_setup_sequence(clp->cl_session, args, res,
+					   cache_reply, task);
 	if (ret) {
 		memset(res, 0, sizeof(*res));
 		if (ret != -EAGAIN) {
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux