Commit f2a031b6 authored by George Spelvin's avatar George Spelvin Committed by Linus Torvalds
Browse files

Rename other copy of hash_string to hashlen_string

The original name was simply hash_string(), but that conflicted with a
function with that name in drivers/base/power/trace.c, and I decided
that calling it "hashlen_" was better anyway.

But you have to do it in two places.

[ This caused build errors for architectures that don't define

Signed-off-by: default avatarGeorge Spelvin <>
Reported-by: default avatarGuenter Roeck <>
Fixes: fcfd2fbf

 ("fs/namei.c: Add hashlen_string() function")
Signed-off-by: default avatarLinus Torvalds <>
parent 037369b8
......@@ -1962,7 +1962,7 @@ unsigned int full_name_hash(const char *name, unsigned int len)
/* Return the "hash_len" (hash and length) of a null-terminated string */
u64 hash_string(const char *name)
u64 hashlen_string(const char *name)
unsigned long hash = init_name_hash();
unsigned long len = 0, c;
......@@ -1975,7 +1975,7 @@ u64 hash_string(const char *name)
} while (c);
return hashlen_create(end_name_hash(hash), len);
* We know there's a real path component here of at least
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment