diff options
author | Christoph Hellwig <hch@lst.de> | 2022-01-18 07:56:14 +0100 |
---|---|---|
committer | Gabriel Krisman Bertazi <krisman@collabora.com> | 2022-01-20 19:57:24 -0500 |
commit | 5298d4bfe80f6ae6ae2777bcd1357b0022d98573 (patch) | |
tree | 60ea007ad0db7e699df97f5d38b66ef811a65b0c /fs/ext4/hash.c | |
parent | 6661224e66f03706daea8e27714436851cf01731 (diff) | |
download | linux-5298d4bfe80f6ae6ae2777bcd1357b0022d98573.tar.bz2 |
unicode: clean up the Kconfig symbol confusion
Turn the CONFIG_UNICODE symbol into a tristate that generates some always
built in code and remove the confusing CONFIG_UNICODE_UTF8_DATA symbol.
Note that a lot of the IS_ENABLED() checks could be turned from cpp
statements into normal ifs, but this change is intended to be fairly
mechanic, so that should be cleaned up later.
Fixes: 2b3d04787012 ("unicode: Add utf8-data module")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Diffstat (limited to 'fs/ext4/hash.c')
-rw-r--r-- | fs/ext4/hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/hash.c b/fs/ext4/hash.c index f34f4176c1e7..147b5241dd94 100644 --- a/fs/ext4/hash.c +++ b/fs/ext4/hash.c @@ -290,7 +290,7 @@ static int __ext4fs_dirhash(const struct inode *dir, const char *name, int len, int ext4fs_dirhash(const struct inode *dir, const char *name, int len, struct dx_hash_info *hinfo) { -#ifdef CONFIG_UNICODE +#if IS_ENABLED(CONFIG_UNICODE) const struct unicode_map *um = dir->i_sb->s_encoding; int r, dlen; unsigned char *buff; |