From patchwork Sun Oct 28 19:02:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 1658261 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 4377BDFE76 for ; Sun, 28 Oct 2012 19:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754612Ab2J1TDd (ORCPT ); Sun, 28 Oct 2012 15:03:33 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:57265 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754606Ab2J1TDa (ORCPT ); Sun, 28 Oct 2012 15:03:30 -0400 Received: by mail-qc0-f174.google.com with SMTP id o22so2248869qcr.19 for ; Sun, 28 Oct 2012 12:03:30 -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=7gEq/EAFi9ab49wf1Je/7sz0EDUM0unmu0cGDxLYXMQ=; b=KFM6Z1iLS5/JyRlvWqPCn9dZ8tOFEtz/EHVQV53CYssZcHsp5/8rcup56pyiYfqANd qc1i9YYbOXVbngiR/7yGrIKGn3XjyTMq9BpaptSs8+W9ti9b0z7hv1XhgxDG6njcAKAH 7jnKfyEYbpGnHFyeB6bbnc0X3v5zVCbnU2f3RONfwnumWdotEUVJp5mVGAmatioowkof 3rzCoUQp4gcOMAkbSO7cfItFsfSXLtTRnTfHc279pfKM11zYbj4P7EOUK+eRnauPZBUw VS10klJhRqTxd7foX4HD4go5MTGROwbBMP8oqF04LtgcDDYqDureMWZN2CfzGBfDqS/8 9lxw== Received: by 10.49.71.107 with SMTP id t11mr20120630qeu.13.1351451010160; Sun, 28 Oct 2012 12:03:30 -0700 (PDT) Received: from localhost.localdomain ([50.145.168.211]) by mx.google.com with ESMTPS id j3sm3921747qek.7.2012.10.28.12.03.25 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 28 Oct 2012 12:03:29 -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 v7 07/16] net,9p: use new hashtable implementation Date: Sun, 28 Oct 2012 15:02:19 -0400 Message-Id: <1351450948-15618-7-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1351450948-15618-1-git-send-email-levinsasha928@gmail.com> References: <1351450948-15618-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, 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;