From 78c388aed2b7184182c08428db1de6c872d815f5 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 4 Jan 1999 16:03:48 +0000 Subject: Merge with Linux 2.1.131 and more MIPS goodies. (Did I mention that CVS is buggy ...) --- fs/lockd/svclock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'fs/lockd/svclock.c') diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index ac650b5f3..b1f1f5588 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -615,6 +615,7 @@ nlmsvc_retry_blocked(void) } if ((block = nlm_blocked) && block->b_when != NLM_NEVER) - return block->b_when; - return 0; + return (block->b_when - jiffies); + + return MAX_SCHEDULE_TIMEOUT; } -- cgit v1.2.3