Commit 59ea3684 authored by ZhangGuoDong's avatar ZhangGuoDong Committed by Steve French
Browse files

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: default avatarZhangGuoDong <zhangguodong@kylinos.cn>
Reviewed-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 85274a3b

fs/smb/client/smb2maperror.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

fs/smb/client/smb2maperror_test.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

fs/smb/client/smb2proto.h

+6 −1
Original line number Diff line number Diff line
@@ -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);