Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 611c96c8 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

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: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 72895b1a

fs/nfs/nfs4proc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3517,7 +3517,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, 
		if (signalled())

		if (signalled())

			break;

			break;

		if (loop++ & 1)

		if (loop++ & 1)

			ssleep(clp->cl_lease_time + 1);

			ssleep(clp->cl_lease_time / HZ + 1);

		else

		else

			if (++clp->cl_id_uniquifier == 0)

			if (++clp->cl_id_uniquifier == 0)

				break;

				break;