[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>

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 {
  * an NFS client.
  */
 struct nlm_file {
-        struct nlm_file *       f_next;         /* linked list */
+        struct hlist_node       f_list;         /* linked list */
         struct nfs_fh           f_handle;       /* NFS file handle */
         struct file *           f_file;         /* VFS file pointer */
         struct nlm_share *      f_shares;       /* DOS shares */
@@ -113,7 +113,6 @@ struct nlm_file {
         unsigned int            f_locks;        /* guesstimate # of locks */
         unsigned int            f_count;        /* reference count */
         struct semaphore        f_sema;         /* avoid concurrent access */
-        int                     f_hash;         /* hash of f_handle */
 };
 
 /*