diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2010-12-13 19:05:46 -0500 |
|---|---|---|
| committer |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-21 11:51:24 -0500 |
| commit | 611c96c8f728c4bcdbadaa2387942d3c0641cadf (patch) | |
| tree | 962deb2f6fd1ba4dcae2c27a1157c46b4fc45476 /fs/nfs/nfs4proc.c | |
| parent | nfs: Take advantage of kmem_cache_zalloc() in nfs_page_alloc() (diff) | |
| download | linux-dev-611c96c8f728c4bcdbadaa2387942d3c0641cadf.tar.xz linux-dev-611c96c8f728c4bcdbadaa2387942d3c0641cadf.zip | |
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/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4435e5e1f904..494c68739ff4 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; |