From patchwork Tue Oct 30 18:46:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1672801 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 F123CDFB7B for ; Tue, 30 Oct 2012 18:51:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932788Ab2J3Sri (ORCPT ); Tue, 30 Oct 2012 14:47:38 -0400 Received: from mail-qa0-f53.google.com ([209.85.216.53]:56829 "EHLO mail-qa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965249Ab2J3Srf (ORCPT ); Tue, 30 Oct 2012 14:47:35 -0400 Received: by mail-qa0-f53.google.com with SMTP id c1so390325qae.19 for ; Tue, 30 Oct 2012 11:47:34 -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=J/Zyiwkp1b37lCvPETdfNSmw4r6qL8+h0Vpz3iuLSKM=; b=Nvrs5mEVtrd1V9xQFVVsd1bL1OgUwAE7PA5XclNSGQTG1HNP6TyofVR4CC10dx2ZKP mXVXmMx0HkWFaI4/aiMAfsUCYTMymv08Rn+jrmr4EylBxM1mDEQwZ67ZYAXxDeuM5Hty TalMDmkifg95t9H1AyPy0C1VBFYsaaoNpBiOkDsBZNYAqvFPdGrY1X+PK2bzw2n56RzJ AiUrSMMi9XECUdXkmpqHTiTyqBC6MKClF42ZWWj0p2hz2BlYf+dE4P508NG+ie3op4TU msD5Tsz63wxZ6mfVBC08ahNBt8hv6uTAzmRxWOqk5DjAftQOBy8rTDZM1r0LKSGBNmPJ Dmjw== Received: by 10.224.179.212 with SMTP id br20mr12826083qab.51.1351622854540; Tue, 30 Oct 2012 11:47:34 -0700 (PDT) Received: from localhost.localdomain ([50.145.164.180]) by mx.google.com with ESMTPS id ga9sm682790qab.22.2012.10.30.11.47.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Oct 2012 11:47:34 -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 v8 07/16] net,9p: use new hashtable implementation Date: Tue, 30 Oct 2012 14:46:03 -0400 Message-Id: <1351622772-16400-7-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1351622772-16400-1-git-send-email-levinsasha928@gmail.com> References: <1351622772-16400-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 file changed, 9 insertions(+), 12 deletions(-) diff --git a/net/9p/error.c b/net/9p/error.c index 2ab2de7..a394b37 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -34,6 +34,7 @@ #include #include #include +#include /** * struct errormap - map string errors from Plan 9 to Linux numeric ids @@ -50,8 +51,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 +194,14 @@ static struct errormap errmap[] = { int p9_error_init(void) { struct errormap *c; - int bucket; - - /* initialize hash table */ - for (bucket = 0; bucket < ERRHASHSZ; bucket++) - INIT_HLIST_HEAD(&hash_errmap[bucket]); + u32 hash; /* 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 +220,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;