From: Sasha Levin <levinsasha928@gmail.com>
To: torvalds@linux-foundation.org
Cc: tj@kernel.org, akpm@linux-foundation.org,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
paul.gortmaker@windriver.com, davem@davemloft.net,
rostedt@goodmis.org, mingo@elte.hu, ebiederm@xmission.com,
aarcange@redhat.com, ericvh@gmail.com, netdev@vger.kernel.org,
josh@joshtriplett.org, eric.dumazet@gmail.com,
mathieu.desnoyers@efficios.com, axboe@kernel.dk, agk@redhat.com,
dm-devel@redhat.com, neilb@suse.de, ccaulfie@redhat.com,
teigland@redhat.com, Trond.Myklebust@netapp.com,
bfields@fieldses.org, fweisbec@gmail.com, jesse@nicira.com,
venkat.x.venkatsubra@oracle.com, ejt@redhat.com,
snitzer@redhat.com, edumazet@google.com,
linux-nfs@vger.kernel.org, dev@openvswitch.org,
rds-devel@oss.oracle.com, lw@cn.fujitsu.com,
Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH v3 13/17] lockd: use new hashtable implementation
Date: Wed, 22 Aug 2012 04:27:08 +0200 [thread overview]
Message-ID: <1345602432-27673-14-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1345602432-27673-1-git-send-email-levinsasha928@gmail.com>
Switch lockd to use the new hashtable implementation. This reduces the amount of
generic unrelated code in lockd.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
fs/lockd/svcsubs.c | 66 ++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 0deb5f6..d223a1f 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -20,6 +20,7 @@
#include <linux/lockd/share.h>
#include <linux/module.h>
#include <linux/mount.h>
+#include <linux/hashtable.h>
#define NLMDBG_FACILITY NLMDBG_SVCSUBS
@@ -28,8 +29,7 @@
* Global file hash table
*/
#define FILE_HASH_BITS 7
-#define FILE_NRHASH (1<<FILE_HASH_BITS)
-static struct hlist_head nlm_files[FILE_NRHASH];
+static DEFINE_HASHTABLE(nlm_files, FILE_HASH_BITS);
static DEFINE_MUTEX(nlm_file_mutex);
#ifdef NFSD_DEBUG
@@ -68,7 +68,7 @@ static inline unsigned int file_hash(struct nfs_fh *f)
int i;
for (i=0; i<NFS2_FHSIZE;i++)
tmp += f->data[i];
- return tmp & (FILE_NRHASH - 1);
+ return tmp;
}
/*
@@ -86,17 +86,17 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
{
struct hlist_node *pos;
struct nlm_file *file;
- unsigned int hash;
+ unsigned int key;
__be32 nfserr;
nlm_debug_print_fh("nlm_lookup_file", f);
- hash = file_hash(f);
+ key = file_hash(f);
/* Lock file table */
mutex_lock(&nlm_file_mutex);
- hlist_for_each_entry(file, pos, &nlm_files[hash], f_list)
+ hash_for_each_possible(nlm_files, file, pos, f_list, file_hash(f))
if (!nfs_compare_fh(&file->f_handle, f))
goto found;
@@ -123,7 +123,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
goto out_free;
}
- hlist_add_head(&file->f_list, &nlm_files[hash]);
+ hash_add(nlm_files, &file->f_list, key);
found:
dprintk("lockd: found file %p (count %d)\n", file, file->f_count);
@@ -147,8 +147,8 @@ static inline void
nlm_delete_file(struct nlm_file *file)
{
nlm_debug_print_file("closing file", file);
- if (!hlist_unhashed(&file->f_list)) {
- hlist_del(&file->f_list);
+ if (hash_hashed(&file->f_list)) {
+ hash_del(&file->f_list);
nlmsvc_ops->fclose(file->f_file);
kfree(file);
} else {
@@ -253,27 +253,25 @@ nlm_traverse_files(void *data, nlm_host_match_fn_t match,
int i, ret = 0;
mutex_lock(&nlm_file_mutex);
- for (i = 0; i < FILE_NRHASH; i++) {
- hlist_for_each_entry_safe(file, pos, next, &nlm_files[i], f_list) {
- if (is_failover_file && !is_failover_file(data, file))
- continue;
- file->f_count++;
- mutex_unlock(&nlm_file_mutex);
-
- /* Traverse locks, blocks and shares of this file
- * and update file->f_locks count */
- if (nlm_inspect_file(data, file, match))
- ret = 1;
-
- mutex_lock(&nlm_file_mutex);
- file->f_count--;
- /* No more references to this file. Let go of it. */
- if (list_empty(&file->f_blocks) && !file->f_locks
- && !file->f_shares && !file->f_count) {
- hlist_del(&file->f_list);
- nlmsvc_ops->fclose(file->f_file);
- kfree(file);
- }
+ hash_for_each_safe(nlm_files, i, pos, next, file, f_list) {
+ if (is_failover_file && !is_failover_file(data, file))
+ continue;
+ file->f_count++;
+ mutex_unlock(&nlm_file_mutex);
+
+ /* Traverse locks, blocks and shares of this file
+ * and update file->f_locks count */
+ if (nlm_inspect_file(data, file, match))
+ ret = 1;
+
+ mutex_lock(&nlm_file_mutex);
+ file->f_count--;
+ /* No more references to this file. Let go of it. */
+ if (list_empty(&file->f_blocks) && !file->f_locks
+ && !file->f_shares && !file->f_count) {
+ hash_del(&file->f_list);
+ nlmsvc_ops->fclose(file->f_file);
+ kfree(file);
}
}
mutex_unlock(&nlm_file_mutex);
@@ -451,3 +449,11 @@ nlmsvc_unlock_all_by_ip(struct sockaddr *server_addr)
return ret ? -EIO : 0;
}
EXPORT_SYMBOL_GPL(nlmsvc_unlock_all_by_ip);
+
+static int __init nlm_init(void)
+{
+ hash_init(nlm_files);
+ return 0;
+}
+
+module_init(nlm_init);
--
1.7.8.6
next prev parent reply other threads:[~2012-08-22 2:28 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-22 2:26 [PATCH v3 00/17] generic hashtable implementation Sasha Levin
2012-08-22 2:26 ` [PATCH v3 01/17] hashtable: introduce a small and naive hashtable Sasha Levin
2012-08-22 18:01 ` Tejun Heo
2012-08-22 23:54 ` Ryan Mallon
2012-08-23 0:24 ` Sasha Levin
2012-08-23 20:04 ` Tejun Heo
2012-08-24 19:47 ` Sasha Levin
2012-08-24 19:59 ` Tejun Heo
2012-08-24 20:11 ` Sasha Levin
2012-08-24 20:33 ` Tejun Heo
2012-08-24 20:53 ` Sasha Levin
2012-08-24 21:23 ` Tejun Heo
2012-08-24 22:59 ` Sasha Levin
2012-08-24 23:07 ` Tejun Heo
2012-08-25 4:24 ` Mathieu Desnoyers
2012-08-28 9:56 ` Sasha Levin
2012-08-28 10:11 ` Mathieu Desnoyers
2012-08-28 11:27 ` Sasha Levin
2012-08-28 11:56 ` Mathieu Desnoyers
2012-08-28 23:00 ` Mathieu Desnoyers
2012-09-04 15:35 ` Steven Rostedt
2012-09-04 16:30 ` Pedro Alves
2012-09-04 16:40 ` Pedro Alves
2012-09-04 17:01 ` Mathieu Desnoyers
2012-09-06 13:53 ` Sasha Levin
2012-09-06 14:19 ` Pedro Alves
2012-09-06 14:33 ` Mathieu Desnoyers
2012-09-06 14:36 ` David Laight
2012-09-06 14:55 ` Josh Triplett
2012-09-06 15:11 ` Steven Rostedt
2012-09-06 15:49 ` Sasha Levin
2012-09-06 16:00 ` Steven Rostedt
2012-09-06 16:21 ` Sasha Levin
2012-09-06 16:50 ` Mathieu Desnoyers
2012-09-06 17:01 ` Sasha Levin
2012-09-06 17:02 ` Mathieu Desnoyers
2012-09-06 17:15 ` Steven Rostedt
2012-09-04 17:17 ` Steven Rostedt
2012-09-04 17:21 ` Pedro Alves
2012-09-04 20:59 ` Steven Rostedt
2012-09-04 21:51 ` Pedro Alves
2012-09-04 22:41 ` Steven Rostedt
2012-09-04 22:58 ` Pedro Alves
2012-09-04 23:27 ` Steven Rostedt
2012-09-04 16:32 ` Mathieu Desnoyers
2012-08-22 2:26 ` [PATCH v3 02/17] userns: use new hashtable implementation Sasha Levin
2012-08-22 2:26 ` [PATCH v3 03/17] mm,ksm: " Sasha Levin
2012-08-22 2:26 ` [PATCH v3 04/17] workqueue: " Sasha Levin
2012-08-22 18:05 ` Tejun Heo
2012-08-22 2:27 ` [PATCH v3 05/17] mm/huge_memory: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 06/17] tracepoint: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 07/17] net,9p: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 08/17] block,elevator: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 09/17] SUNRPC/cache: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 10/17] dlm: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 11/17] net,l2tp: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 12/17] dm: " Sasha Levin
2012-08-22 2:27 ` Sasha Levin [this message]
2012-08-22 11:47 ` [PATCH v3 13/17] lockd: " J. Bruce Fields
2012-08-22 12:13 ` Sasha Levin
2012-08-22 13:12 ` J. Bruce Fields
2012-08-22 13:22 ` Mathieu Desnoyers
2012-08-22 17:32 ` Sasha Levin
2012-08-22 2:27 ` [PATCH v3 14/17] net,rds: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 15/17] openvswitch: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 16/17] tracing output: " Sasha Levin
2012-08-22 2:27 ` [PATCH v3 17/17] SUNRPC: use new hashtable implementation in auth Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345602432-27673-14-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=Trond.Myklebust@netapp.com \
--cc=aarcange@redhat.com \
--cc=agk@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bfields@fieldses.org \
--cc=ccaulfie@redhat.com \
--cc=davem@davemloft.net \
--cc=dev@openvswitch.org \
--cc=dm-devel@redhat.com \
--cc=ebiederm@xmission.com \
--cc=edumazet@google.com \
--cc=ejt@redhat.com \
--cc=eric.dumazet@gmail.com \
--cc=ericvh@gmail.com \
--cc=fweisbec@gmail.com \
--cc=jesse@nicira.com \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=lw@cn.fujitsu.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@elte.hu \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=rds-devel@oss.oracle.com \
--cc=rostedt@goodmis.org \
--cc=snitzer@redhat.com \
--cc=teigland@redhat.com \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=venkat.x.venkatsubra@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).