[PATCH] Rename other copy of hash_string to hashlen_string
From: George Spelvin
Date: Sun May 29 2016 - 01:26:45 EST
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.
Signed-off-by: George Spelvin <linux@xxxxxxxxxxxxxxxxxxx>
Fixes: fcfd2fbf22d2587196890103d41e3d554c47da0e
---
fs/namei.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 968dae02..aefba699 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1952,7 +1952,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;
@@ -1965,7 +1965,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
--
2.8.1