Skip to content

Commit d8f5265

Browse files
ChenXiaoSongsmfrench
authored andcommitted
smb/client: update some SMB2 status strings
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> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 9146c7e commit d8f5265

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

fs/smb/client/smb2maperror.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
2727
{STATUS_WAIT_2, -EIO, "STATUS_WAIT_2"},
2828
{STATUS_WAIT_3, -EIO, "STATUS_WAIT_3"},
2929
{STATUS_WAIT_63, -EIO, "STATUS_WAIT_63"},
30-
{STATUS_ABANDONED, -EIO, "STATUS_ABANDONED"},
31-
{STATUS_ABANDONED_WAIT_0, -EIO, "STATUS_ABANDONED_WAIT_0"},
30+
{STATUS_ABANDONED, -EIO, "STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
31+
{STATUS_ABANDONED_WAIT_0, -EIO,
32+
"STATUS_ABANDONED or STATUS_ABANDONED_WAIT_0"},
3233
{STATUS_ABANDONED_WAIT_63, -EIO, "STATUS_ABANDONED_WAIT_63"},
3334
{STATUS_USER_APC, -EIO, "STATUS_USER_APC"},
3435
{STATUS_KERNEL_APC, -EIO, "STATUS_KERNEL_APC"},
@@ -2297,8 +2298,9 @@ static const struct status_to_posix_error smb2_error_map_table[] = {
22972298
{STATUS_FWP_LIFETIME_MISMATCH, -EIO, "STATUS_FWP_LIFETIME_MISMATCH"},
22982299
{STATUS_FWP_BUILTIN_OBJECT, -EIO, "STATUS_FWP_BUILTIN_OBJECT"},
22992300
{STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS, -EIO,
2300-
"STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"},
2301-
{STATUS_FWP_TOO_MANY_CALLOUTS, -EIO, "STATUS_FWP_TOO_MANY_CALLOUTS"},
2301+
"STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
2302+
{STATUS_FWP_TOO_MANY_CALLOUTS, -EIO,
2303+
"STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"},
23022304
{STATUS_FWP_NOTIFICATION_DROPPED, -EIO,
23032305
"STATUS_FWP_NOTIFICATION_DROPPED"},
23042306
{STATUS_FWP_TRAFFIC_MISMATCH, -EIO, "STATUS_FWP_TRAFFIC_MISMATCH"},

0 commit comments

Comments
 (0)