diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /fs/lockd/clntlock.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'fs/lockd/clntlock.c')
| -rw-r--r-- | fs/lockd/clntlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index 98814d220..ad70f7b55 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c @@ -71,7 +71,7 @@ nlmclnt_block(struct nlm_host *host, struct file_lock *fl, u32 *statp) * nlmclnt_lock for an explanation. */ current->timeout = jiffies + 30 * HZ; - interruptible_sleep_on(&block.b_wait); + sleep_on(&block.b_wait); for (head = &nlm_blocked; *head; head = &(*head)->b_next) { if (*head == &block) { |