summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-12-14 00:05:46 (GMT)
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-12-21 16:51:24 (GMT)
commit611c96c8f728c4bcdbadaa2387942d3c0641cadf (patch)
tree962deb2f6fd1ba4dcae2c27a1157c46b4fc45476 /fs/nfs
parent72895b1ac7baeda76835cddb3edb019a90d32bcb (diff)
downloadlinux-611c96c8f728c4bcdbadaa2387942d3c0641cadf.tar.xz
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
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;