Commit 3d7bfea8 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by Jaegeuk Kim

unicode: Add utf8_casefold_hash

This adds a case insensitive hash function to allow taking the hash
without needing to allocate a casefolded copy of the string.

The existing d_hash implementations for casefolding allocate memory
within rcu-walk, by avoiding it we can be more efficient and avoid
worrying about a failed allocation.
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Reviewed-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent e6c3948d
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/parser.h> #include <linux/parser.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/unicode.h> #include <linux/unicode.h>
#include <linux/stringhash.h>
#include "utf8n.h" #include "utf8n.h"
...@@ -122,9 +123,29 @@ int utf8_casefold(const struct unicode_map *um, const struct qstr *str, ...@@ -122,9 +123,29 @@ int utf8_casefold(const struct unicode_map *um, const struct qstr *str,
} }
return -EINVAL; return -EINVAL;
} }
EXPORT_SYMBOL(utf8_casefold); EXPORT_SYMBOL(utf8_casefold);
int utf8_casefold_hash(const struct unicode_map *um, const void *salt,
struct qstr *str)
{
const struct utf8data *data = utf8nfdicf(um->version);
struct utf8cursor cur;
int c;
unsigned long hash = init_name_hash(salt);
if (utf8ncursor(&cur, data, str->name, str->len) < 0)
return -EINVAL;
while ((c = utf8byte(&cur))) {
if (c < 0)
return -EINVAL;
hash = partial_name_hash((unsigned char)c, hash);
}
str->hash = end_name_hash(hash);
return 0;
}
EXPORT_SYMBOL(utf8_casefold_hash);
int utf8_normalize(const struct unicode_map *um, const struct qstr *str, int utf8_normalize(const struct unicode_map *um, const struct qstr *str,
unsigned char *dest, size_t dlen) unsigned char *dest, size_t dlen)
{ {
......
...@@ -27,6 +27,9 @@ int utf8_normalize(const struct unicode_map *um, const struct qstr *str, ...@@ -27,6 +27,9 @@ int utf8_normalize(const struct unicode_map *um, const struct qstr *str,
int utf8_casefold(const struct unicode_map *um, const struct qstr *str, int utf8_casefold(const struct unicode_map *um, const struct qstr *str,
unsigned char *dest, size_t dlen); unsigned char *dest, size_t dlen);
int utf8_casefold_hash(const struct unicode_map *um, const void *salt,
struct qstr *str);
struct unicode_map *utf8_load(const char *version); struct unicode_map *utf8_load(const char *version);
void utf8_unload(struct unicode_map *um); void utf8_unload(struct unicode_map *um);
......
Markdown is supported
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