diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/lockd/svclock.c | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/lockd/svclock.c')
-rw-r--r-- | fs/lockd/svclock.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |