Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

ChenXiaoSong and committed by
Steve French
d8f52650 9146c7e5

+6 -4
+6 -4
fs/smb/client/smb2maperror.c
··· 27 27 {STATUS_WAIT_2, -EIO, "STATUS_WAIT_2"}, 28 28 {STATUS_WAIT_3, -EIO, "STATUS_WAIT_3"}, 29 29 {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"}, 32 33 {STATUS_ABANDONED_WAIT_63, -EIO, "STATUS_ABANDONED_WAIT_63"}, 33 34 {STATUS_USER_APC, -EIO, "STATUS_USER_APC"}, 34 35 {STATUS_KERNEL_APC, -EIO, "STATUS_KERNEL_APC"}, ··· 2298 2297 {STATUS_FWP_LIFETIME_MISMATCH, -EIO, "STATUS_FWP_LIFETIME_MISMATCH"}, 2299 2298 {STATUS_FWP_BUILTIN_OBJECT, -EIO, "STATUS_FWP_BUILTIN_OBJECT"}, 2300 2299 {STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS, -EIO, 2301 - "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS"}, 2302 - {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO, "STATUS_FWP_TOO_MANY_CALLOUTS"}, 2300 + "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"}, 2301 + {STATUS_FWP_TOO_MANY_CALLOUTS, -EIO, 2302 + "STATUS_FWP_TOO_MANY_BOOTTIME_FILTERS or STATUS_FWP_TOO_MANY_CALLOUTS"}, 2303 2303 {STATUS_FWP_NOTIFICATION_DROPPED, -EIO, 2304 2304 "STATUS_FWP_NOTIFICATION_DROPPED"}, 2305 2305 {STATUS_FWP_TRAFFIC_MISMATCH, -EIO, "STATUS_FWP_TRAFFIC_MISMATCH"},