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]>
huntrar · May 29, 2016 · f2a031b · f2a031b
1 parent 037369b
commit f2a031b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fs/namei.c b/fs/namei.c
@@ -1962,7 +1962,7 @@ unsigned int full_name_hash(const char *name, unsigned int len)
 EXPORT_SYMBOL(full_name_hash);
 
 /* 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);
 }
-EXPORT_SYMBOL(hash_string);
+EXPORT_SYMBOL(hashlen_string);
 
 /*
  * We know there's a real path component here of at least