korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 14:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename other copy of hash_string to hashlen_string

Browse Source 
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
  CONFIG_DCACHE_WORD_ACCESS   - Linus ]

Signed-off-by: George Spelvin <linux@sciencehorizons.net>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: fcfd2fbf22 ("fs/namei.c: Add hashlen_string() function")
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
George Spelvin 2016-05-29 01:26:41 -04:00 committed by Linus Torvalds
parent 037369b872
commit f2a031b66e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/namei.c
View File

@ -1962,7 +1962,7 @@ unsigned int full_name_hash(const char *name, unsigned int len)
EXPORT_SYMBOL(full_name_hash); EXPORT_SYMBOL(full_name_hash);
/* Return the "hash_len" (hash and length) of a null-terminated string */ /* 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 hash = init_name_hash();
unsigned long len = 0, c; unsigned long len = 0, c;
@ -1975,7 +1975,7 @@ u64 hash_string(const char *name)
} while (c); } while (c);
return hashlen_create(end_name_hash(hash), len); return hashlen_create(end_name_hash(hash), len);
} }
EXPORT_SYMBOL(hash_string); EXPORT_SYMBOL(hashlen_string);
/* /*
* We know there's a real path component here of at least * We know there's a real path component here of at least