From: chenxiaosong.chenxiaosong@linux.dev
To: sfrench@samba.org, smfrench@gmail.com, linkinjeon@kernel.org,
linkinjeon@samba.org
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
liuzhengyuan@kylinos.cn, huhai@kylinos.cn, liuyun01@kylinos.cn,
ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: [PATCH 28/30] smb/client: use bsearch() to find target in mapping_table_ERRSRV array
Date: Mon, 8 Dec 2025 14:20:58 +0800 [thread overview]
Message-ID: <20251208062100.3268777-29-chenxiaosong.chenxiaosong@linux.dev> (raw)
In-Reply-To: <20251208062100.3268777-1-chenxiaosong.chenxiaosong@linux.dev>
From: ChenXiaoSong <chenxiaosong@kylinos.cn>
The array currently has 37 elements. When searching for the last element,
the original loop-based search method requires 37 comparisons, while
binary search algorithm requires only 5 comparisons.
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
fs/smb/client/netmisc.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/fs/smb/client/netmisc.c b/fs/smb/client/netmisc.c
index 4b5c049d69b9..8f3242c1d3da 100644
--- a/fs/smb/client/netmisc.c
+++ b/fs/smb/client/netmisc.c
@@ -817,6 +817,8 @@ DEFINE_SEARCH_FUNC(ntstatus_to_dos, ntstatus, ntstatus_to_dos_map, ntstatus_to_d
DEFINE_SEARCH_FUNC(nt_err_code_struct, nt_errcode, nt_errs, nt_err_num);
/* search_in_mapping_table_ERRDOS */
DEFINE_SEARCH_FUNC(smb_to_posix_error, smb_err, mapping_table_ERRDOS, errdos_num);
+/* search_in_mapping_table_ERRSRV */
+DEFINE_SEARCH_FUNC(smb_to_posix_error, smb_err, mapping_table_ERRSRV, errsrv_num);
/*****************************************************************************
Print an error message from the status code
@@ -861,7 +863,6 @@ int
map_smb_to_linux_error(char *buf, bool logErr)
{
struct smb_hdr *smb = (struct smb_hdr *)buf;
- unsigned int i;
int rc = -EIO; /* if transport error smb error may not be set */
__u8 smberrclass;
__u16 smberrcode;
@@ -897,19 +898,9 @@ map_smb_to_linux_error(char *buf, bool logErr)
rc = err_map->posix_code;
} else if (smberrclass == ERRSRV) {
/* server class of error codes */
- for (i = 0;
- i <
- sizeof(mapping_table_ERRSRV) /
- sizeof(struct smb_to_posix_error); i++) {
- if (mapping_table_ERRSRV[i].smb_err == 0)
- break;
- else if (mapping_table_ERRSRV[i].smb_err ==
- smberrcode) {
- rc = mapping_table_ERRSRV[i].posix_code;
- break;
- }
- /* else try next error mapping to see if match */
- }
+ err_map = search_in_mapping_table_ERRSRV(smberrcode);
+ if (err_map)
+ rc = err_map->posix_code;
}
/* else ERRHRD class errors or junk - return EIO */
--
2.43.0
next prev parent reply other threads:[~2025-12-08 6:23 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-08 6:20 [PATCH 00/30] smb: improve search speed of SMB1 maperror chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 01/30] smb/client: fix NT_STATUS_NO_DATA_DETECTED value chenxiaosong.chenxiaosong
2025-12-09 0:17 ` ChenXiaoSong
2025-12-09 0:29 ` Steve French
2025-12-09 0:45 ` ChenXiaoSong
2025-12-08 6:20 ` [PATCH 02/30] smb/client: fix NT_STATUS_DEVICE_DOOR_OPEN value chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 03/30] smb/client: fix NT_STATUS_UNABLE_TO_FREE_VM value chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 04/30] smb/server: remove unused nterr.h chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 05/30] smb/client: add 4 NT error code definitions chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 06/30] smb/client: add parentheses to NT error code definitions containing bitwise OR operator chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 07/30] smb/client: introduce DEFINE_CMP_FUNC() chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 08/30] smb/client: sort ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 09/30] smb/client: create netmisc_test.c and introduce DEFINE_CHECK_SORT_FUNC() chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 10/30] smb/client: introduce KUnit test to check sort result of ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 11/30] smb/client: introduce DEFINE_SEARCH_FUNC() chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 12/30] smb/client: use bsearch() to find target in ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 13/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 14/30] smb/client: introduce DEFINE_CHECK_SEARCH_FUNC() chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 15/30] smb/client: introduce KUnit test to check search result of ntstatus_to_dos_map array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 16/30] smb/client: sort nt_errs array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 17/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 18/30] smb/client: use bsearch() to find target in " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 19/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 20/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 21/30] smb/client: sort mapping_table_ERRDOS array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 22/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 23/30] smb/client: use bsearch() to find target in " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 24/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 25/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 26/30] smb/client: sort mapping_table_ERRSRV array chenxiaosong.chenxiaosong
2025-12-08 6:20 ` [PATCH 27/30] smb/client: introduce KUnit test to check sort result of " chenxiaosong.chenxiaosong
2025-12-08 6:20 ` chenxiaosong.chenxiaosong [this message]
2025-12-08 6:20 ` [PATCH 29/30] smb/client: remove useless elements from " chenxiaosong.chenxiaosong
2025-12-08 6:21 ` [PATCH 30/30] smb/client: introduce KUnit test to check search result of " chenxiaosong.chenxiaosong
2025-12-09 23:41 ` [PATCH 00/30] smb: improve search speed of SMB1 maperror Steve French
2025-12-10 2:48 ` ChenXiaoSong
2025-12-10 4:32 ` ChenXiaoSong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251208062100.3268777-29-chenxiaosong.chenxiaosong@linux.dev \
--to=chenxiaosong.chenxiaosong@linux.dev \
--cc=chenxiaosong@kylinos.cn \
--cc=huhai@kylinos.cn \
--cc=linkinjeon@kernel.org \
--cc=linkinjeon@samba.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
--cc=liuzhengyuan@kylinos.cn \
--cc=sfrench@samba.org \
--cc=smfrench@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®