diff --git a/[refs] b/[refs] index f079e82e03b7..377ea2d59bb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 460f5cac1e24e947509b6112c99c5bc9ff687b45 +refs/heads/master: 0ade060ee51b9b6cf18d580405dc9ab90067f69f diff --git a/trunk/fs/lockd/clntlock.c b/trunk/fs/lockd/clntlock.c index a4ab6dd7661f..e8c7765419e8 100644 --- a/trunk/fs/lockd/clntlock.c +++ b/trunk/fs/lockd/clntlock.c @@ -184,7 +184,7 @@ reclaimer(void *ptr) /* 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. */