From: "George Spelvin" <linux@sciencehorizons.net>
To: bfields@fieldses.org, jlayton@poochiereds.net,
linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org,
torvalds@linux-foundation.org
Cc: linux@sciencehorizons.net, tglx@linutronix.de
Subject: [PATCH 03/10] <linux/sunrpc/svcauth.h>: Define hash_str() in terms of hash_string()
Date: 25 May 2016 03:26:30 -0400 [thread overview]
Message-ID: <20160525072630.5343.qmail@ns.sciencehorizons.net> (raw)
In-Reply-To: <CA+55aFxPSW+84KfQ1N_WmND-wtvgj2zQm8nFPkRcc+gyU=uing@mail.gmail.com>
Finally, the first use of previous two patches: Eliminate the
separate ad-hoc string hash functions in the sunrpc code.
This also eliminates the only caller of hash_long which asks for
more than 32 bits of output.
sunrpc guys: Is it okay if I send this to Linus directly?
Signed-off-by: George Spelvin <linux@sciencehorizons.net>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: linux-nfs@vger.kernel.org
---
include/linux/sunrpc/svcauth.h | 36 +++++-------------------------------
1 file changed, 5 insertions(+), 31 deletions(-)
diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
index c00f53a4..ef2b2552 100644
--- a/include/linux/sunrpc/svcauth.h
+++ b/include/linux/sunrpc/svcauth.h
@@ -16,6 +16,7 @@
#include <linux/sunrpc/cache.h>
#include <linux/sunrpc/gss_api.h>
#include <linux/hash.h>
+#include <linux/stringhash.h>
#include <linux/cred.h>
struct svc_cred {
@@ -165,41 +166,14 @@ extern int svcauth_unix_set_client(struct svc_rqst *rqstp);
extern int unix_gid_cache_create(struct net *net);
extern void unix_gid_cache_destroy(struct net *net);
-static inline unsigned long hash_str(char *name, int bits)
+static inline unsigned long hash_str(char const *name, int bits)
{
- unsigned long hash = 0;
- unsigned long l = 0;
- int len = 0;
- unsigned char c;
- do {
- if (unlikely(!(c = *name++))) {
- c = (char)len; len = -1;
- }
- l = (l << 8) | c;
- len++;
- if ((len & (BITS_PER_LONG/8-1))==0)
- hash = hash_long(hash^l, BITS_PER_LONG);
- } while (len);
- return hash >> (BITS_PER_LONG - bits);
+ return hash_32(hashlen_hash(hash_string(name)), bits);
}
-static inline unsigned long hash_mem(char *buf, int length, int bits)
+static inline unsigned long hash_mem(char const *buf, int length, int bits)
{
- unsigned long hash = 0;
- unsigned long l = 0;
- int len = 0;
- unsigned char c;
- do {
- if (len == length) {
- c = (char)len; len = -1;
- } else
- c = *buf++;
- l = (l << 8) | c;
- len++;
- if ((len & (BITS_PER_LONG/8-1))==0)
- hash = hash_long(hash^l, BITS_PER_LONG);
- } while (len);
- return hash >> (BITS_PER_LONG - bits);
+ return hash_32(full_name_hash(buf, length), bits);
}
#endif /* __KERNEL__ */
--
2.8.1
next prev parent reply other threads:[~2016-05-25 7:26 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CA+55aFxPSW+84KfQ1N_WmND-wtvgj2zQm8nFPkRcc+gyU=uing@mail.gmail.com>
2016-05-25 7:20 ` [PATCH 00/10] String hash improvements George Spelvin
2016-05-25 8:00 ` Geert Uytterhoeven
2016-05-25 8:11 ` George Spelvin
2016-05-25 8:50 ` Geert Uytterhoeven
2016-05-25 9:07 ` George Spelvin
2016-05-25 16:08 ` Linus Torvalds
2016-05-28 19:57 ` [PATCH v3 " George Spelvin
2016-05-28 19:57 ` [PATCH v3 01/10] Pull out string hash to <linux/stringhash.h> George Spelvin
2016-05-28 19:57 ` [PATCH v3 02/10] fs/namei.c: Add hashlen_string() function George Spelvin
2016-05-28 19:57 ` [PATCH v3 03/10] <linux/sunrpc/svcauth.h>: Define hash_str() in terms of hashlen_string() George Spelvin
2016-05-28 19:57 ` [PATCH v3 04/10] Change hash_64() return value to 32 bits George Spelvin
2016-05-28 19:57 ` [PATCH v3 05/10] Eliminate bad hash multipliers from hash_32() and hash_64() George Spelvin
2016-05-28 19:57 ` [PATCH v3 06/10] fs/namei.c: Improve dcache hash function George Spelvin
2016-05-30 15:11 ` Peter Zijlstra
2016-05-30 16:06 ` George Spelvin
2016-05-30 16:27 ` Peter Zijlstra
2016-05-30 18:10 ` George Spelvin
2016-06-02 1:18 ` Linus Torvalds
2016-06-02 2:31 ` George Spelvin
2016-06-02 16:35 ` Linus Torvalds
2016-06-02 18:23 ` George Spelvin
2016-05-28 19:57 ` [PATCH v3 07/10] <linux/hash.h>: Add support for architecture-specific functions George Spelvin
2016-05-29 7:57 ` Geert Uytterhoeven
2016-05-28 19:57 ` [PATCH v3 08/10] m68k: Add <asm/hash.h> George Spelvin
2016-05-28 19:57 ` [PATCH v3 09/10] microblaze: " George Spelvin
2016-05-28 19:57 ` [PATCH v3 10/10] h8300: " George Spelvin
2016-05-28 20:47 ` [PATCH v3 00/10] String hash improvements Linus Torvalds
2016-05-28 20:54 ` George Spelvin
2016-06-02 22:59 ` [PATCH " Fubo Chen
2016-05-26 17:09 ` [PATCH v2 " George Spelvin
2016-05-25 7:21 ` [PATCH 01/10] Pull out string hash to <linux/stringhash.h> George Spelvin
2016-05-25 7:22 ` [PATCH 02/10] fs/namei.c: Add hash_string() function George Spelvin
2016-05-25 7:26 ` George Spelvin [this message]
2016-05-25 7:28 ` [PATCH 04/10] Change hash_64() return value to 32 bits George Spelvin
2016-05-25 7:29 ` [PATCH 05/10] Eliminate bad hash multipliers from hash_32() and hash_64() George Spelvin
2016-05-25 7:31 ` [PATCH 06/10] fs/namei.c: Improve dcache hash function George Spelvin
2016-05-25 7:33 ` [PATCH 07/10] <linux/hash.h>: Add support for architecture-specific functions George Spelvin
2016-05-26 17:16 ` [PATCH v2 " George Spelvin
2016-05-25 7:34 ` [PATCH 08/10] m68k: Add <asm/archhash.h> George Spelvin
2016-05-25 7:34 ` George Spelvin
2016-05-25 8:07 ` Geert Uytterhoeven
2016-05-25 8:19 ` George Spelvin
2016-05-25 8:24 ` [PATCH 08v2/10] " George Spelvin
2016-05-25 8:48 ` Geert Uytterhoeven
2016-05-25 8:56 ` [PATCH 08/10] " Philippe De Muyter
2016-05-25 9:14 ` George Spelvin
2016-05-25 9:31 ` Andreas Schwab
2016-05-25 9:51 ` Philippe De Muyter
2016-05-25 13:24 ` Philippe De Muyter
2016-05-25 13:42 ` George Spelvin
2016-05-26 17:19 ` [PATCH v2 08/10] m68k: Add <asm/hash.h> George Spelvin
2016-05-25 7:37 ` [PATCH 09/10] microblaze: Add <asm/archhash.h> George Spelvin
2016-05-26 17:21 ` [PATCH v2 09/10] microblaze: Add <asm/hash.h> George Spelvin
2016-05-25 7:38 ` [PATCH 10/10] h8300: Add <asm/archhash.h> George Spelvin
2016-05-26 17:23 ` [PATCH v2 10/10] h8300: Add <asm/hash.h> George Spelvin
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=20160525072630.5343.qmail@ns.sciencehorizons.net \
--to=linux@sciencehorizons.net \
--cc=bfields@fieldses.org \
--cc=jlayton@poochiereds.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=tglx@linutronix.de \
--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: 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).