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, Sasha Levin <levinsasha928@gmail.com> Subject: [RFC v3 7/7] net,9p: use new hashtable implementation Date: Tue, 7 Aug 2012 02:45:17 +0200 [thread overview] Message-ID: <1344300317-23189-9-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1344300317-23189-1-git-send-email-levinsasha928@gmail.com> Switch 9p error table to use the new hashtable implementation. This reduces the amount of generic unrelated code in 9p. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- net/9p/error.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/net/9p/error.c b/net/9p/error.c index 2ab2de7..f712344d 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -34,7 +34,7 @@ #include <linux/jhash.h> #include <linux/errno.h> #include <net/9p/9p.h> - +#include <linux/hashtable.h> /** * struct errormap - map string errors from Plan 9 to Linux numeric ids * @name: string sent over 9P @@ -50,8 +50,8 @@ struct errormap { struct hlist_node list; }; -#define ERRHASHSZ 32 -static struct hlist_head hash_errmap[ERRHASHSZ]; +#define ERR_HASH_BITS 5 +static DEFINE_HASHTABLE(hash_errmap, ERR_HASH_BITS); /* FixMe - reduce to a reasonable size */ static struct errormap errmap[] = { @@ -193,18 +193,17 @@ static struct errormap errmap[] = { int p9_error_init(void) { struct errormap *c; - int bucket; + u32 hash; /* initialize hash table */ - for (bucket = 0; bucket < ERRHASHSZ; bucket++) - INIT_HLIST_HEAD(&hash_errmap[bucket]); + hash_init(hash_errmap, ERR_HASH_BITS); /* load initial error map into hash table */ for (c = errmap; c->name != NULL; c++) { c->namelen = strlen(c->name); - bucket = jhash(c->name, c->namelen, 0) % ERRHASHSZ; + hash = jhash(c->name, c->namelen, 0); INIT_HLIST_NODE(&c->list); - hlist_add_head(&c->list, &hash_errmap[bucket]); + hash_add(hash_errmap, ERR_HASH_BITS, &c->list, hash); } return 1; @@ -223,13 +222,13 @@ int p9_errstr2errno(char *errstr, int len) int errno; struct hlist_node *p; struct errormap *c; - int bucket; + u32 hash; errno = 0; p = NULL; c = NULL; - bucket = jhash(errstr, len, 0) % ERRHASHSZ; - hlist_for_each_entry(c, p, &hash_errmap[bucket], list) { + hash = jhash(errstr, len, 0); + hash_for_each_possible(hash_errmap, c, ERR_HASH_BITS, p, list, hash) { if (c->namelen == len && !memcmp(c->name, errstr, len)) { errno = c->val; break; -- 1.7.8.6
WARNING: multiple messages have this Message-ID (diff)
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, Sasha Levin <levinsasha928@gmail.com> Subject: [RFC v3 7/7] net,9p: use new hashtable implementation Date: Tue, 7 Aug 2012 02:45:17 +0200 [thread overview] Message-ID: <1344300317-23189-9-git-send-email-levinsasha928@gmail.com> (raw) In-Reply-To: <1344300317-23189-1-git-send-email-levinsasha928@gmail.com> Switch 9p error table to use the new hashtable implementation. This reduces the amount of generic unrelated code in 9p. Signed-off-by: Sasha Levin <levinsasha928@gmail.com> --- net/9p/error.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/net/9p/error.c b/net/9p/error.c index 2ab2de7..f712344d 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -34,7 +34,7 @@ #include <linux/jhash.h> #include <linux/errno.h> #include <net/9p/9p.h> - +#include <linux/hashtable.h> /** * struct errormap - map string errors from Plan 9 to Linux numeric ids * @name: string sent over 9P @@ -50,8 +50,8 @@ struct errormap { struct hlist_node list; }; -#define ERRHASHSZ 32 -static struct hlist_head hash_errmap[ERRHASHSZ]; +#define ERR_HASH_BITS 5 +static DEFINE_HASHTABLE(hash_errmap, ERR_HASH_BITS); /* FixMe - reduce to a reasonable size */ static struct errormap errmap[] = { @@ -193,18 +193,17 @@ static struct errormap errmap[] = { int p9_error_init(void) { struct errormap *c; - int bucket; + u32 hash; /* initialize hash table */ - for (bucket = 0; bucket < ERRHASHSZ; bucket++) - INIT_HLIST_HEAD(&hash_errmap[bucket]); + hash_init(hash_errmap, ERR_HASH_BITS); /* load initial error map into hash table */ for (c = errmap; c->name != NULL; c++) { c->namelen = strlen(c->name); - bucket = jhash(c->name, c->namelen, 0) % ERRHASHSZ; + hash = jhash(c->name, c->namelen, 0); INIT_HLIST_NODE(&c->list); - hlist_add_head(&c->list, &hash_errmap[bucket]); + hash_add(hash_errmap, ERR_HASH_BITS, &c->list, hash); } return 1; @@ -223,13 +222,13 @@ int p9_errstr2errno(char *errstr, int len) int errno; struct hlist_node *p; struct errormap *c; - int bucket; + u32 hash; errno = 0; p = NULL; c = NULL; - bucket = jhash(errstr, len, 0) % ERRHASHSZ; - hlist_for_each_entry(c, p, &hash_errmap[bucket], list) { + hash = jhash(errstr, len, 0); + hash_for_each_possible(hash_errmap, c, ERR_HASH_BITS, p, list, hash) { if (c->namelen == len && !memcmp(c->name, errstr, len)) { errno = c->val; break; -- 1.7.8.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-08-07 0:45 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-07 0:45 [RFC v3 0/7] generic hashtable implementation Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` [RFC v3 1/7] hashtable: introduce a small and naive hashtable Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 1:19 ` Joe Perches 2012-08-07 1:19 ` Joe Perches 2012-08-07 1:19 ` Joe Perches 2012-08-07 1:48 ` Li Wei 2012-08-07 1:48 ` Li Wei 2012-08-07 1:54 ` Sasha Levin 2012-08-07 1:54 ` Sasha Levin 2012-08-07 2:55 ` Josh Triplett 2012-08-07 2:55 ` Josh Triplett 2012-08-07 9:49 ` Sasha Levin 2012-08-07 9:49 ` Sasha Levin 2012-08-07 0:45 ` [RFC v3 2/7] user_ns: use new hashtable implementation Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` [RFC v3 3/7] mm,ksm: " Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` [RFC v3 4/7] workqueue: " Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 1:19 ` Joe Perches 2012-08-07 1:19 ` Joe Perches 2012-08-07 1:19 ` Joe Perches 2012-08-07 0:45 ` [RFC v3 5/7] mm/huge_memory: " Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` [RFC v3 6/7] tracepoint: " Sasha Levin 2012-08-07 0:45 ` Sasha Levin 2012-08-07 0:45 ` Sasha Levin [this message] 2012-08-07 0:45 ` [RFC v3 7/7] net,9p: " 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=1344300317-23189-9-git-send-email-levinsasha928@gmail.com \ --to=levinsasha928@gmail.com \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=davem@davemloft.net \ --cc=ebiederm@xmission.com \ --cc=eric.dumazet@gmail.com \ --cc=ericvh@gmail.com \ --cc=josh@joshtriplett.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mathieu.desnoyers@efficios.com \ --cc=mingo@elte.hu \ --cc=netdev@vger.kernel.org \ --cc=paul.gortmaker@windriver.com \ --cc=rostedt@goodmis.org \ --cc=tj@kernel.org \ --cc=torvalds@linux-foundation.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.