Skip to contentSkip to conversation

2.4.19 fix for fuzzy hash <linux/ghash.h>

PATCH In review Bart Trojanowski 2 participants 3 messages Sep 11, 2002 – Sep 18, 2002

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.4.19 fix for fuzzy hash <linux/ghash.h>

The DEF_HASH_FUZZY macro allows the user to template their hash; it takes on a paramter for the hashing-function, namely HASHFN. When used with a hashing-function named anything other than 'hashfn()', a module using the kernel's fuzzy hash implementation will not compile.

None of the in-kernel 2.4.x drivers use this primitive (yet) so it's no wonder no one has spotted it. The patch is very trivial and makes me think that I am the very first user of the include/linux/ghash.h
hash-table primitive. ;)

Bart.

include/linux/ghash.h +2 -2
diff -ruN linux-2.4.19/include/linux/ghash.h linux-2.4.19+ghash-fix/include/linux/ghash.h
@@ -106,7 +106,7 @@
 \
 LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
 {\
-	int ix = hashfn(pos);\
+	int ix = HASHFN(pos);\
 	TYPE * ptr = tbl->hashtable[ix];\
 	while(ptr && KEYCMP(ptr->KEY, pos))\
 		ptr = ptr->PTRS.next_hash;\
@@ -206,7 +206,7 @@
 \
 LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
 {\
-	int ix = hashfn(pos);\
+	int ix = HASHFN(pos);\
 	TYPE * ptr = tbl->hashtable[ix];\
 	while(ptr && KEYCMP(ptr->KEY, pos))\
 		ptr = ptr->PTRS.next_hash;\
include/linux/ghash.h~ +0 -1
diff -ruN linux-2.4.19/include/linux/ghash.h~ linux-2.4.19+ghash-fix/include/linux/ghash.h~
@@ -1,4 +1,3 @@
-
 /*
  * include/linux/ghash.h -- generic hashing with fuzzy retrieval
  *
#1 lore raw
Quoted 11 lines · Bart Trojanowski

The DEF_HASH_FUZZY macro allows the user to template their hash; it takes on a paramter for the hashing-function, namely HASHFN. When used with a hashing-function named anything other than 'hashfn()', a module using the kernel's fuzzy hash implementation will not compile.

None of the in-kernel 2.4.x drivers use this primitive (yet) so it's no wonder no one has spotted it. The patch is very trivial and makes me think that I am the very first user of the include/linux/ghash.h
hash-table primitive. ;)

Bart.

Please ignore the garbage at the end of the last patch.

Here is a cleaned up one.

Bart.

include/linux/ghash.h +2 -2
diff -ruN linux-2.4.19/include/linux/ghash.h linux-2.4.19+ghash-fix/include/linux/ghash.h
@@ -106,7 +106,7 @@
 \
 LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
 {\
-	int ix = hashfn(pos);\
+	int ix = HASHFN(pos);\
 	TYPE * ptr = tbl->hashtable[ix];\
 	while(ptr && KEYCMP(ptr->KEY, pos))\
 		ptr = ptr->PTRS.next_hash;\
@@ -206,7 +206,7 @@
 \
 LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
 {\
-	int ix = hashfn(pos);\
+	int ix = HASHFN(pos);\
 	TYPE * ptr = tbl->hashtable[ix];\
 	while(ptr && KEYCMP(ptr->KEY, pos))\
 		ptr = ptr->PTRS.next_hash;\
#2 lore raw
In reply to Bart Trojanowski
Quoted 9 lines · On Wed, 11 Sep 2002 14:02:32 -0400 Bart Trojanowski <[email protected]> wrote:

The DEF_HASH_FUZZY macro allows the user to template their hash; it takes on a paramter for the hashing-function, namely HASHFN. When used with a hashing-function named anything other than 'hashfn()', a module using the kernel's fuzzy hash implementation will not compile.

None of the in-kernel 2.4.x drivers use this primitive (yet) so it's no wonder no one has spotted it. The patch is very trivial and makes me think that I am the very first user of the include/linux/ghash.h
hash-table primitive. ;)

That's why I was going to submit a patch to turf it out in 2.5. 2.5's include/hash.h provides a hashing function: did you really want ghash.h?

Cheers,
Rusty.

Signature · 2 lines
   there are those who do and those who hang on and you don't see too
   many doers quoting their contemporaries.  -- Larry McVoy