Skip to content

Commit f2a031b

Browse files
George Spelvintorvalds
authored andcommitted
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 CONFIG_DCACHE_WORD_ACCESS - Linus ] Signed-off-by: George Spelvin <[email protected]> Reported-by: Guenter Roeck <[email protected]> Fixes: fcfd2fb ("fs/namei.c: Add hashlen_string() function") Signed-off-by: Linus Torvalds <[email protected]>
1 parent 037369b commit f2a031b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/namei.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ unsigned int full_name_hash(const char *name, unsigned int len)
19621962
EXPORT_SYMBOL(full_name_hash);
19631963

19641964
/* Return the "hash_len" (hash and length) of a null-terminated string */
1965-
u64 hash_string(const char *name)
1965+
u64 hashlen_string(const char *name)
19661966
{
19671967
unsigned long hash = init_name_hash();
19681968
unsigned long len = 0, c;
@@ -1975,7 +1975,7 @@ u64 hash_string(const char *name)
19751975
} while (c);
19761976
return hashlen_create(end_name_hash(hash), len);
19771977
}
1978-
EXPORT_SYMBOL(hash_string);
1978+
EXPORT_SYMBOL(hashlen_string);
19791979

19801980
/*
19811981
* We know there's a real path component here of at least

0 commit comments

Comments
 (0)