From: J. Bruce Fields <bfields@redhat.com>
Date: Tue, 14 Dec 2010 00:05:46 +0000 (-0500)
Subject: nfs4: fix units bug causing hang on recovery
X-Git-Tag: v3.12-rc1~7782^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=611c96c8f728c4bcdbadaa2387942d3c0641cadf;p=kernel%2Fkernel-generic.git

nfs4: fix units bug causing hang on recovery

Note that cl_lease_time is in jiffies.  This can cause a very long wait
in the NFS4ERR_CLID_INUSE case.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4435e5e..494c687 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3517,7 +3517,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
 		if (signalled())
 			break;
 		if (loop++ & 1)
-			ssleep(clp->cl_lease_time + 1);
+			ssleep(clp->cl_lease_time / HZ + 1);
 		else
 			if (++clp->cl_id_uniquifier == 0)
 				break;