From patchwork Sun Aug 19 00:52:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1341861 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 28C1CE0118 for ; Sun, 19 Aug 2012 00:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120Ab2HSAxe (ORCPT ); Sat, 18 Aug 2012 20:53:34 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:41176 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752117Ab2HSAw0 (ORCPT ); Sat, 18 Aug 2012 20:52:26 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so1596913bkw.19 for ; Sat, 18 Aug 2012 17:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=cC0FxFngzPFP7m/x0KmE3AKt+sioSRwbulaylPUlfyk=; b=LaNyLPh0fBvZlZi5Zhdpv/EMbPiQZINxcYvC7ZmThIMDkC+PyAKjliSeCg0RDOBIjJ zEUDfvmLX4WHPmPMJVXz9eTL0/TwvKgHaTUyX9nzBKwh6UhFhND6phX814fI5o7w1cG1 GT/+Kc42F7aclucbFf3hV8KEaJMaw0kfPH8BT+vAAPs9E8JrlMG6i+QwhIXZLbnMVhrc USXGFsMrgm050J2f0lORgSAIDGmkw5WM5bah2o7EU4zprdxAayhAhwoRTwiKtQbejQsF bejx7QbqCq9GXGH9u71bxGXZGPFuY+phNfDGsY7tCyv7Gtf2koY4MG6EQn+xg/IBMDG3 GJvw== Received: by 10.204.132.80 with SMTP id a16mr3336930bkt.82.1345337545297; Sat, 18 Aug 2012 17:52:25 -0700 (PDT) Received: from localhost.localdomain (95-89-78-76-dynip.superkabel.de. [95.89.78.76]) by mx.google.com with ESMTPS id c18sm4724437bkv.8.2012.08.18.17.52.22 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 18 Aug 2012 17:52:24 -0700 (PDT) From: Sasha Levin 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 Subject: [PATCH v2 07/16] net,9p: use new hashtable implementation Date: Sun, 19 Aug 2012 02:52:21 +0200 Message-Id: <1345337550-24304-9-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> References: <1345337550-24304-1-git-send-email-levinsasha928@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org 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 --- 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..a5cc7dd 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -34,7 +34,7 @@ #include #include #include - +#include /** * 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); /* 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, &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, p, list, hash) { if (c->namelen == len && !memcmp(c->name, errstr, len)) { errno = c->val; break;