Commit 6c1eb31e authored by ChenXiaoSong's avatar ChenXiaoSong Committed by Steve French
Browse files

smb/client: reduce loop count in map_smb2_to_linux_error() by half 



The smb2_error_map_table array currently has 1743 elements. When searching
for the last element and calling smb2_print_status(), 3486 comparisons
are needed.

The loop in smb2_print_status() is unnecessary, smb2_print_status() can be
removed, and only iterate over the array once, printing the message when
the target status code is found.

Signed-off-by: default avatarChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 7ad78592

fs/smb/client/smb2maperror.c

+6 −24
Original line number Diff line number Diff line
@@ -2418,24 +2418,6 @@ static const struct status_to_posix_error smb2_error_map_table[] = { 
	{0, 0, NULL}

};



/*****************************************************************************

 Print an error message from the status code

 *****************************************************************************/

static void

smb2_print_status(__le32 status)

{

	int idx = 0;



	while (smb2_error_map_table[idx].status_string != NULL) {

		if ((smb2_error_map_table[idx].smb2_status) == status) {

			pr_notice("Status code returned 0x%08x %s\n", status,

				  smb2_error_map_table[idx].status_string);

		}

		idx++;

	}

	return;

}



int

map_smb2_to_linux_error(char *buf, bool log_err)

{
@@ -2452,16 +2434,16 @@ map_smb2_to_linux_error(char *buf, bool log_err) 
		return 0;

	}



	/* mask facility */

	if (log_err && (smb2err != STATUS_MORE_PROCESSING_REQUIRED) &&

	    (smb2err != STATUS_END_OF_FILE))

		smb2_print_status(smb2err);

	else if (cifsFYI & CIFS_RC)

		smb2_print_status(smb2err);

	log_err = (log_err && (smb2err != STATUS_MORE_PROCESSING_REQUIRED) &&

		   (smb2err != STATUS_END_OF_FILE)) ||

		  (cifsFYI & CIFS_RC);



	for (i = 0; i < sizeof(smb2_error_map_table) /

			sizeof(struct status_to_posix_error); i++) {

		if (smb2_error_map_table[i].smb2_status == smb2err) {

			if (log_err)

				pr_notice("Status code returned 0x%08x %s\n", smb2err,

					  smb2_error_map_table[i].status_string);

			rc = smb2_error_map_table[i].posix_error;

			break;

		}