diff options
| author | ZhangGuoDong <zhangguodong@kylinos.cn> | 2026-04-03 18:38:52 +0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2026-04-06 03:58:40 +0300 |
| commit | 59ea368431ddf0569ac9201162bfea969fe3a03c (patch) | |
| tree | 3767249e96b0c0cf2d3a8af17130edebd0a6c2dd | |
| parent | 85274a3bd40f46a17f520c9d84a5b72d4704d2c3 (diff) | |
| download | linux-59ea368431ddf0569ac9201162bfea969fe3a03c.tar.xz | |
smb/client: move smb2maperror declarations to smb2proto.h
For `smb2_error_map_table_test` and `smb2_error_map_num`, if their types
are changed in `smb2maperror.c` but the corresponding extern declarations
in `smb2maperror_test.c` are not updated, the compiler will not report an
error. Moving them to a common header file allows the compiler to catch
type mismatches.
Signed-off-by: ZhangGuoDong <zhangguodong@kylinos.cn>
Reviewed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/smb/client/smb2maperror.c | 3 | ||||
| -rw-r--r-- | fs/smb/client/smb2maperror_test.c | 6 | ||||
| -rw-r--r-- | fs/smb/client/smb2proto.h | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c index 2b8782c4f684..9ed21f7b618c 100644 --- a/fs/smb/client/smb2maperror.c +++ b/fs/smb/client/smb2maperror.c @@ -112,9 +112,6 @@ int __init smb2_init_maperror(void) #define EXPORT_SYMBOL_FOR_SMB_TEST(sym) \ EXPORT_SYMBOL_FOR_MODULES(sym, "smb2maperror_test") -/* Previous prototype for eliminating the build warning. */ -const struct status_to_posix_error *smb2_get_err_map_test(__u32 smb2_status); - const struct status_to_posix_error *smb2_get_err_map_test(__u32 smb2_status) { return smb2_get_err_map(smb2_status); diff --git a/fs/smb/client/smb2maperror_test.c b/fs/smb/client/smb2maperror_test.c index 8c4f168c8e99..0f8a44a5ed3c 100644 --- a/fs/smb/client/smb2maperror_test.c +++ b/fs/smb/client/smb2maperror_test.c @@ -9,11 +9,9 @@ */ #include <kunit/test.h> +#include "cifsglob.h" #include "smb2glob.h" - -const struct status_to_posix_error *smb2_get_err_map_test(__u32 smb2_status); -extern const struct status_to_posix_error *smb2_error_map_table_test; -extern unsigned int smb2_error_map_num; +#include "smb2proto.h" static void test_cmp_map(struct kunit *test, const struct status_to_posix_error *expect) diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h index 230bb1e9f4e1..5f74475ba9d1 100644 --- a/fs/smb/client/smb2proto.h +++ b/fs/smb/client/smb2proto.h @@ -14,7 +14,6 @@ #include <linux/key-type.h> #include "cached_dir.h" -struct statfs; struct smb_rqst; /* @@ -24,6 +23,12 @@ struct smb_rqst; */ int map_smb2_to_linux_error(char *buf, bool log_err); int smb2_init_maperror(void); +#if IS_ENABLED(CONFIG_SMB_KUNIT_TESTS) +const struct status_to_posix_error *smb2_get_err_map_test(__u32 smb2_status); +extern const struct status_to_posix_error *smb2_error_map_table_test; +extern unsigned int smb2_error_map_num; +#endif + int smb2_check_message(char *buf, unsigned int pdu_len, unsigned int len, struct TCP_Server_Info *server); unsigned int smb2_calc_size(void *buf); |