diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-09-18 10:36:24 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-09-18 10:36:24 -0400 |
| commit | 040823b5372b445d1d9483811e85a24d71314d33 (patch) | |
| tree | 086fe0b8eaf9faec1444e75a6edc77817a62b6b4 | |
| parent | e85526404ca70fa49f3d13b3898b067392522b24 (diff) | |
| parent | aa28b98d6dbcdb1c822b53f90e509565dfc450b0 (diff) | |
| download | linux-040823b5372b445d1d9483811e85a24d71314d33.tar.gz linux-040823b5372b445d1d9483811e85a24d71314d33.tar.bz2 linux-040823b5372b445d1d9483811e85a24d71314d33.zip | |
Merge tag 'unicode-next-v5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev
fs/unicode patches for 5.4-rc1
This includes two fixes for the unicode system for inclusion into Linux
v5.4.
- A patch from Krzysztof Wilczynski solving a build time warning.
- A patch from Colin King making a parsing format static, to reduce
stack size.
Build validated and run time tested using xfstests casefold testcase.
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
| -rw-r--r-- | fs/unicode/utf8-core.c | 2 | ||||
| -rw-r--r-- | fs/unicode/utf8-selftest.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c index 71ca4d047d65..2a878b739115 100644 --- a/fs/unicode/utf8-core.c +++ b/fs/unicode/utf8-core.c @@ -154,7 +154,7 @@ static int utf8_parse_version(const char *version, unsigned int *maj, { substring_t args[3]; char version_string[12]; - const struct match_token token[] = { + static const struct match_token token[] = { {1, "%d.%d.%d"}, {0, NULL} }; diff --git a/fs/unicode/utf8-selftest.c b/fs/unicode/utf8-selftest.c index 6c1a36bbf6ad..6fe8af7edccb 100644 --- a/fs/unicode/utf8-selftest.c +++ b/fs/unicode/utf8-selftest.c @@ -35,7 +35,7 @@ unsigned int total_tests; #define test_f(cond, fmt, ...) _test(cond, __func__, __LINE__, fmt, ##__VA_ARGS__) #define test(cond) _test(cond, __func__, __LINE__, "") -const static struct { +static const struct { /* UTF-8 strings in this vector _must_ be NULL-terminated. */ unsigned char str[10]; unsigned char dec[10]; @@ -89,7 +89,7 @@ const static struct { }; -const static struct { +static const struct { /* UTF-8 strings in this vector _must_ be NULL-terminated. */ unsigned char str[30]; unsigned char ncf[30]; |