diff options
| author | Christoph Hellwig | 2006-03-20 19:44:40 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2006-03-20 19:44:40 +0100 |
| commit | 26bcbf965f857c710adafd16cf424f043006b5dd (patch) | |
| tree | fa3c1e4ba07ab3d1e4e61b27c7579c57fd2d5c65 /fs/lockd/host.c | |
| parent | lockd: Make lockd use rpc_new_client() instead of rpc_create_client (diff) | |
| download | kernel-qcow2-linux-26bcbf965f857c710adafd16cf424f043006b5dd.tar.gz kernel-qcow2-linux-26bcbf965f857c710adafd16cf424f043006b5dd.tar.xz kernel-qcow2-linux-26bcbf965f857c710adafd16cf424f043006b5dd.zip | |
lockd: stop abusing file_lock_list
Currently lockd directly access the file_lock_list from fs/locks.c.
It does so to mark locks granted or reclaimable. This is very
suboptimal, because a) lockd needs to poke into locks.c internals, and
b) it needs to iterate over all locks in the system for marking locks
granted or reclaimable.
This patch adds lists for granted and reclaimable locks to the nlm_host
structure instead, and adds locks to those.
nlmclnt_lock:
now adds the lock to h_granted instead of setting the
NFS_LCK_GRANTED, still O(1)
nlmclnt_mark_reclaim:
goes away completely, replaced by a list_splice_init.
Complexity reduced from O(locks in the system) to O(1)
reclaimer:
iterates over h_reclaim now, complexity reduced from
O(locks in the system) to O(locks per nlm_host)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/host.c')
| -rw-r--r-- | fs/lockd/host.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 100e78229700..f456f8ed9acd 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -123,6 +123,8 @@ nlm_lookup_host(int server, struct sockaddr_in *sin, nlm_hosts[hash] = host; INIT_LIST_HEAD(&host->h_lockowners); spin_lock_init(&host->h_lock); + INIT_LIST_HEAD(&host->h_granted); + INIT_LIST_HEAD(&host->h_reclaim); if (++nrhosts > NLM_HOST_MAX) next_gc = 0; |