From: Steve French <smfrench@gmail.com>
To: chenxiaosong.chenxiaosong@linux.dev
Cc: linkinjeon@kernel.org, linkinjeon@samba.org,
linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
liuzhengyuan@kylinos.cn, huhai@kylinos.cn, liuyun01@kylinos.cn,
ChenXiaoSong <chenxiaosong@kylinos.cn>
Subject: Re: [PATCH v4 09/10] smb/client: update some SMB2 status strings
Date: Sun, 7 Dec 2025 11:47:47 -0600 [thread overview]
Message-ID: <CAH2r5mtrVo4FMd-fwhJ8FKovage=429AWU6TeyB5RkpZtzBA1g@mail.gmail.com> (raw)
In-Reply-To: <20251206151826.2932970-10-chenxiaosong.chenxiaosong@linux.dev>
Good catch - merged into cifs-2.6.git for-next
On Sat, Dec 6, 2025 at 9:20 AM <chenxiaosong.chenxiaosong@linux.dev> wrote:
>
> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
>
> The smb2maperror KUnit tests reported the following errors:
>
> KTAP version 1
> 1..1
> KTAP version 1
> # Subtest: smb2_maperror
> # module: cifs
> 1..2
> ok 1 maperror_test_check_sort
> # maperror_test_check_search: EXPECTATION FAILED at fs/smb/client/smb2maperror_test.c:40
> Expected expect->status_string == result->status_string, but
> expect->status_string == "STATUS_ABANDONED_WAIT_0"
> result->status_string == "STATUS_ABANDONED"
> # maperror_test_check_search: EXPECTATION FAILED at fs/smb/client/smb2maperror_test.c:40
> Expected expect->status_string == result->status_string, but
> expect->status_string == "STATUS_FWP_TOO_MANY_CALLOUTS"
> result->status_string == "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"
> not ok 2 maperror_test_check_search
> # smb2_maperror: pass:1 fail:1 skip:0 total:2
> # Totals: pass:1 fail:1 skip:0 total:2
> not ok 1 smb2_maperror
>
> These status codes have duplicate values, so update the status strings to
> make the log messages more explicit.
>
> Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
> ---
> fs/smb/client/smb2maperror.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/smb/client/smb2maperror.c b/fs/smb/client/smb2maperror.c
> index dc2edeafc93b..e54b5871ecc9 100644
> --- a/fs/smb/client/smb2maperror.c
> +++ b/fs/smb/client/smb2maperror.c
> @@ -22,8 +22,9 @@ static struct status_to_posix_error smb2_error_map_table[] = {
> {STATUS_WAIT_2, -EIO, "STATUS_WAIT_2"},
> {STATUS_WAIT_3, -EIO, "STATUS_WAIT_3"},
> {STATUS_WAIT_63, -EIO, "STATUS_WAIT_63"},
> - {STATUS_ABANDONED, -EIO, "STATUS_ABANDONED"},
> - {STATUS_ABANDONED_WAIT_0, -EIO, "STATUS_ABANDONED_WAIT_0"},
> + {STATUS_ABANDONED, -EIO, "STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
> + {STATUS_ABANDONED_WAIT_0, -EIO,
> + "STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
> {STATUS_ABANDONED_WAIT_63, -EIO, "STATUS_ABANDONED_WAIT_63"},
> {STATUS_USER_APC, -EIO, "STATUS_USER_APC"},
> {STATUS_KERNEL_APC, -EIO, "STATUS_KERNEL_APC"},
> @@ -2292,8 +2293,9 @@ static struct status_to_posix_error smb2_error_map_table[] = {
> {STATUS_FWP_LIFETIME_MISMATCH, -EIO, "STATUS_FWP_LIFETIME_MISMATCH"},
> {STATUS_FWP_BUILTIN_OBJECT, -EIO, "STATUS_FWP_BUILTIN_OBJECT"},
> {STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS, -EIO,
> - "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"},
> - {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO, "STATUS_FWP_TOO_MANY_CALLOUTS"},
> + "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
> + {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO,
> + "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
> {STATUS_FWP_NOTIFICATION_DROPPED, -EIO,
> "STATUS_FWP_NOTIFICATION_DROPPED"},
> {STATUS_FWP_TRAFFIC_MISMATCH, -EIO, "STATUS_FWP_TRAFFIC_MISMATCH"},
> --
> 2.43.0
>
--
Thanks,
Steve
next prev parent reply other threads:[~2025-12-07 17:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-06 15:18 [PATCH v4 00/10] smb: improve search speed of SMB2 maperror chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 01/10] smb/client: reduce loop count in map_smb2_to_linux_error() by half chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 02/10] smb/client: remove unused elements from smb2_error_map_table array chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 03/10] smb: rename to STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 04/10] smb/client: add two elements to smb2_error_map_table array chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 05/10] smb/client: sort " chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 06/10] smb/client: use bsearch() to find target status code chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 07/10] smb/client: introduce smb2_get_err_map() chenxiaosong.chenxiaosong
2025-12-06 15:18 ` [PATCH v4 08/10] smb/client: introduce smb2maperror KUnit tests chenxiaosong.chenxiaosong
2025-12-08 21:29 ` kernel test robot
2025-12-09 3:45 ` kernel test robot
2025-12-06 15:18 ` [PATCH v4 09/10] smb/client: update some SMB2 status strings chenxiaosong.chenxiaosong
2025-12-07 17:47 ` Steve French [this message]
2025-12-06 15:18 ` [PATCH v4 10/10] smb/server: rename include guard in smb_common.h chenxiaosong.chenxiaosong
2025-12-10 4:29 ` [PATCH v4 00/10] smb: improve search speed of SMB2 maperror 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='CAH2r5mtrVo4FMd-fwhJ8FKovage=429AWU6TeyB5RkpZtzBA1g@mail.gmail.com' \
--to=smfrench@gmail.com \
--cc=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 \
/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;
as well as URLs for NNTP newsgroup(s).