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

Commit 0ade060e authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

[PATCH] knfsd: lockd: fix use of h_nextrebind 



nlmclnt_recovery would try to force a portmap rebind by setting
host->h_nextrebind to 0.  The right thing to do here is to set it to the
current time.

Signed-off-by: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 460f5cac

fs/lockd/clntlock.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ restart: 
	/* Force a portmap getport - the peer's lockd will

	 * most likely end up on a different port.

	 */

	host->h_nextrebind = 0;

	host->h_nextrebind = jiffies;

	nlm_rebind_host(host);



	/* First, reclaim all locks that have been granted. */