diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /fs/lockd | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/clntlock.c | 29 | ||||
| -rw-r--r-- | fs/lockd/svclock.c | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index a3a4f072f..f89188d12 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c @@ -162,7 +162,8 @@ reclaimer(void *ptr) { struct nlm_host *host = (struct nlm_host *) ptr; struct nlm_wait *block; - struct list_head *tmp; + struct file_lock *fl; + struct inode *inode; /* This one ensures that our parent doesn't terminate while the * reclaim is in progress */ @@ -170,21 +171,19 @@ reclaimer(void *ptr) lockd_up(); /* First, reclaim all locks that have been granted previously. */ -restart: - tmp = file_lock_list.next; - while (tmp != &file_lock_list) { - struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link); - struct inode *inode = fl->fl_file->f_dentry->d_inode; - if (inode->i_sb->s_magic == NFS_SUPER_MAGIC && - nlm_cmp_addr(NFS_ADDR(inode), &host->h_addr) && - fl->fl_u.nfs_fl.state != host->h_state && - (fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) { - fl->fl_u.nfs_fl.flags &= ~ NFS_LCK_GRANTED; - nlmclnt_reclaim(host, fl); - goto restart; + do { + for (fl = file_lock_table; fl; fl = fl->fl_nextlink) { + inode = fl->fl_file->f_dentry->d_inode; + if (inode->i_sb->s_magic == NFS_SUPER_MAGIC + && nlm_cmp_addr(NFS_ADDR(inode), &host->h_addr) + && fl->fl_u.nfs_fl.state != host->h_state + && (fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) { + fl->fl_u.nfs_fl.flags &= ~ NFS_LCK_GRANTED; + nlmclnt_reclaim(host, fl); + break; + } } - tmp = tmp->next; - } + } while (fl); host->h_reclaiming = 0; wake_up(&host->h_gracewait); diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 56c8d8173..279fcc3c1 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -347,7 +347,7 @@ again: /* Append to list of blocked */ nlmsvc_insert_block(block, NLM_NEVER); - if (!list_empty(&block->b_call.a_args.lock.fl.fl_block)) { + if (!block->b_call.a_args.lock.fl.fl_prevblock) { /* Now add block to block list of the conflicting lock if we haven't done so. */ dprintk("lockd: blocking on this lock.\n"); |