aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/lockd
diff options
context:
space:
mode:
authorOlaf Kirch <okir@suse.de>2006-10-04 05:15:58 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:17 -0400
commit07ba80635117c136714084e019375aa508365375 (patch)
tree06160152e4b9c137669a5c833366858f72601895 /include/linux/lockd
parent68a2d76cea4234bc027df23085d9df4f2171f7fc (diff)
[PATCH] knfsd: change nlm_file to use a hlist
This changes struct nlm_file and the nlm_files hash table to use a hlist instead of the home-grown lists. This allows us to remove f_hash which was only used to find the right hash chain to delete an entry from. It also increases the size of the nlm_files hash table from 32 to 128. Signed-off-by: Olaf Kirch <okir@suse.de> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/lockd')
-rw-r--r--include/linux/lockd/lockd.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 2e740f6a2f77..777a91e1ac8f 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -105,7 +105,7 @@ struct nlm_rqst {
105 * an NFS client. 105 * an NFS client.
106 */ 106 */
107struct nlm_file { 107struct nlm_file {
108 struct nlm_file * f_next; /* linked list */ 108 struct hlist_node f_list; /* linked list */
109 struct nfs_fh f_handle; /* NFS file handle */ 109 struct nfs_fh f_handle; /* NFS file handle */
110 struct file * f_file; /* VFS file pointer */ 110 struct file * f_file; /* VFS file pointer */
111 struct nlm_share * f_shares; /* DOS shares */ 111 struct nlm_share * f_shares; /* DOS shares */
@@ -113,7 +113,6 @@ struct nlm_file {
113 unsigned int f_locks; /* guesstimate # of locks */ 113 unsigned int f_locks; /* guesstimate # of locks */
114 unsigned int f_count; /* reference count */ 114 unsigned int f_count; /* reference count */
115 struct semaphore f_sema; /* avoid concurrent access */ 115 struct semaphore f_sema; /* avoid concurrent access */
116 int f_hash; /* hash of f_handle */
117}; 116};
118 117
119/* 118/*