[PATCH 00/17] smb/client: update SMB1 maperror

[PATCH 00/17] smb/client: update SMB1 maperror

[chenxiaosong.chenxiaosong]

From: ChenXiaoSong <chenxiaosong@kylinos.cn>

My dear team member, Huiwen He, added some NT error code macro definitions
and updated some arrays of SMB1 maperror. He will also update the relevant
code in the userspace Samba repository.

This is a preparation to improve the search speed of the SMB1 maperror.
Huiwen He and I will soon complete the patches of improving the search
speed of the SMB1 maperror (I have already sent the first version).

Huiwen He (17):
  smb/client: map NT_STATUS_INVALID_INFO_CLASS to ERRbadpipe
  smb/client: add NT_STATUS_OS2_INVALID_LEVEL
  smb/client: rename ERRinvlevel to ERRunknownlevel
  smb/client: add NT_STATUS_VARIABLE_NOT_FOUND
  smb/client: add NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT
  smb/client: add NT_STATUS_VOLUME_DISMOUNTED
  smb/client: add NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT
  smb/client: add NT_STATUS_ENCRYPTION_FAILED
  smb/client: add NT_STATUS_DECRYPTION_FAILED
  smb/client: add NT_STATUS_RANGE_NOT_FOUND
  smb/client: add NT_STATUS_NO_RECOVERY_POLICY
  smb/client: add NT_STATUS_NO_EFS
  smb/client: add NT_STATUS_WRONG_EFS
  smb/client: add NT_STATUS_NO_USER_KEYS
  smb/client: add NT_STATUS_VOLUME_NOT_UPGRADED
  smb/client: remove some literal NT error codes from
    ntstatus_to_dos_map
  smb/client: remove useless comment in mapping_table_ERRSRV

 fs/smb/client/nterr.c        | 15 ++++++++++++
 fs/smb/client/nterr.h        | 13 +++++++++++
 fs/smb/client/smb1maperror.c | 45 ++++++++++++------------------------
 fs/smb/client/smberr.h       |  2 +-
 4 files changed, 44 insertions(+), 31 deletions(-)

-- 
2.43.0

[PATCH 01/17] smb/client: map NT_STATUS_INVALID_INFO_CLASS to ERRbadpipe

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-CIFS 2.2.2.4 STATUS_INVALID_INFO_CLASS.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/smb1maperror.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 1565f249452d..31b907362989 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -119,7 +119,7 @@ static const struct {
 	{
 	ERRDOS, ERRgeneral, NT_STATUS_UNSUCCESSFUL}, {
 	ERRDOS, ERRbadfunc, NT_STATUS_NOT_IMPLEMENTED}, {
-	ERRDOS, ERRinvlevel, NT_STATUS_INVALID_INFO_CLASS}, {
+	ERRDOS, ERRbadpipe, NT_STATUS_INVALID_INFO_CLASS}, {
 	ERRDOS, 24, NT_STATUS_INFO_LENGTH_MISMATCH}, {
 	ERRHRD, ERRgeneral, NT_STATUS_ACCESS_VIOLATION}, {
 	ERRHRD, ERRgeneral, NT_STATUS_IN_PAGE_ERROR}, {
-- 
2.43.0

[PATCH 02/17] smb/client: add NT_STATUS_OS2_INVALID_LEVEL

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-CIFS 2.2.2.4 STATUS_OS2_INVALID_LEVEL.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 77f84767b7df..7f29fd5a482d 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -684,5 +684,6 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_NO_SUCH_JOB", NT_STATUS_NO_SUCH_JOB},
 	{"NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP",
 	 NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP},
+	{"NT_STATUS_OS2_INVALID_LEVEL", NT_STATUS_OS2_INVALID_LEVEL},
 	{NULL, 0}
 };
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 81f1a78cf41f..be74410da6d5 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -552,5 +552,6 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
+#define NT_STATUS_OS2_INVALID_LEVEL 0x007c0001
 
 #endif				/* _NTERR_H */
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 31b907362989..6347b2b856e5 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -669,7 +669,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-	ERRDOS, ERRinvlevel, 0x007c0001}, {
+	ERRDOS, ERRinvlevel, NT_STATUS_OS2_INVALID_LEVEL}, {
 	0, 0, 0 }
 };
 
-- 
2.43.0

[PATCH 03/17] smb/client: rename ERRinvlevel to ERRunknownlevel

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-CIFS 2.2.2.4 ERRunknownlevel. Keep the name consistent with the
documentation.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/smb1maperror.c | 4 ++--
 fs/smb/client/smberr.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 6347b2b856e5..0735f7ed676d 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -47,7 +47,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = {
 	{ERRinvparm, -EINVAL},
 	{ERRdiskfull, -ENOSPC},
 	{ERRinvname, -ENOENT},
-	{ERRinvlevel, -EOPNOTSUPP},
+	{ERRunknownlevel, -EOPNOTSUPP},
 	{ERRdirnotempty, -ENOTEMPTY},
 	{ERRnotlocked, -ENOLCK},
 	{ERRcancelviolation, -ENOLCK},
@@ -669,7 +669,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-	ERRDOS, ERRinvlevel, NT_STATUS_OS2_INVALID_LEVEL}, {
+	ERRDOS, ERRunknownlevel, NT_STATUS_OS2_INVALID_LEVEL}, {
 	0, 0, 0 }
 };
 
diff --git a/fs/smb/client/smberr.h b/fs/smb/client/smberr.h
index aeffdad829e2..6fb63f9e9a95 100644
--- a/fs/smb/client/smberr.h
+++ b/fs/smb/client/smberr.h
@@ -80,7 +80,7 @@
 #define ERRinvparm		87
 #define ERRdiskfull		112
 #define ERRinvname		123
-#define ERRinvlevel		124
+#define ERRunknownlevel		124
 #define ERRdirnotempty		145
 #define ERRnotlocked		158
 #define ERRcancelviolation	173
-- 
2.43.0

[PATCH 04/17] smb/client: add NT_STATUS_VARIABLE_NOT_FOUND

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_VARIABLE_NOT_FOUND.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 7f29fd5a482d..6f30bd5dcf61 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -346,6 +346,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_STACK_OVERFLOW", NT_STATUS_STACK_OVERFLOW},
 	{"NT_STATUS_NO_SUCH_PACKAGE", NT_STATUS_NO_SUCH_PACKAGE},
 	{"NT_STATUS_BAD_FUNCTION_TABLE", NT_STATUS_BAD_FUNCTION_TABLE},
+	{"NT_STATUS_VARIABLE_NOT_FOUND", NT_STATUS_VARIABLE_NOT_FOUND},
 	{"NT_STATUS_DIRECTORY_NOT_EMPTY", NT_STATUS_DIRECTORY_NOT_EMPTY},
 	{"NT_STATUS_FILE_CORRUPT_ERROR", NT_STATUS_FILE_CORRUPT_ERROR},
 	{"NT_STATUS_NOT_A_DIRECTORY", NT_STATUS_NOT_A_DIRECTORY},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index be74410da6d5..e7d431d43b76 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -301,6 +301,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_STACK_OVERFLOW (0xC0000000 | 0x00fd)
 #define NT_STATUS_NO_SUCH_PACKAGE (0xC0000000 | 0x00fe)
 #define NT_STATUS_BAD_FUNCTION_TABLE (0xC0000000 | 0x00ff)
+#define NT_STATUS_VARIABLE_NOT_FOUND (0xC0000000 | 0x0100)
 #define NT_STATUS_DIRECTORY_NOT_EMPTY (0xC0000000 | 0x0101)
 #define NT_STATUS_FILE_CORRUPT_ERROR (0xC0000000 | 0x0102)
 #define NT_STATUS_NOT_A_DIRECTORY (0xC0000000 | 0x0103)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 0735f7ed676d..2f81c4adef81 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -391,7 +391,7 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_STACK_OVERFLOW}, {
 	ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_PACKAGE}, {
 	ERRHRD, ERRgeneral, NT_STATUS_BAD_FUNCTION_TABLE}, {
-	ERRDOS, 203, 0xc0000100}, {
+	ERRDOS, 203, NT_STATUS_VARIABLE_NOT_FOUND}, {
 	ERRDOS, 145, NT_STATUS_DIRECTORY_NOT_EMPTY}, {
 	ERRHRD, ERRgeneral, NT_STATUS_FILE_CORRUPT_ERROR}, {
 	ERRDOS, 267, NT_STATUS_NOT_A_DIRECTORY}, {
-- 
2.43.0

[PATCH 05/17] smb/client: add NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 2 ++
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 6f30bd5dcf61..1c5d7199f556 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -487,6 +487,8 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_DISK_RESET_FAILED", NT_STATUS_DISK_RESET_FAILED},
 	{"NT_STATUS_SHARED_IRQ_BUSY", NT_STATUS_SHARED_IRQ_BUSY},
 	{"NT_STATUS_FT_ORPHANING", NT_STATUS_FT_ORPHANING},
+	{"NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT",
+	 NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT},
 	{"NT_STATUS_PARTITION_FAILURE", NT_STATUS_PARTITION_FAILURE},
 	{"NT_STATUS_INVALID_BLOCK_LENGTH", NT_STATUS_INVALID_BLOCK_LENGTH},
 	{"NT_STATUS_DEVICE_NOT_PARTITIONED",
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index e7d431d43b76..1aa4bc394405 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -411,6 +411,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_DISK_RESET_FAILED (0xC0000000 | 0x016b)
 #define NT_STATUS_SHARED_IRQ_BUSY (0xC0000000 | 0x016c)
 #define NT_STATUS_FT_ORPHANING (0xC0000000 | 0x016d)
+#define NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT (0xC0000000 | 0x016e)
 #define NT_STATUS_PARTITION_FAILURE (0xC0000000 | 0x0172)
 #define NT_STATUS_INVALID_BLOCK_LENGTH (0xC0000000 | 0x0173)
 #define NT_STATUS_DEVICE_NOT_PARTITIONED (0xC0000000 | 0x0174)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 2f81c4adef81..3085e2084f99 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -501,7 +501,7 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_DISK_RESET_FAILED}, {
 	ERRHRD, ERRgeneral, NT_STATUS_SHARED_IRQ_BUSY}, {
 	ERRHRD, ERRgeneral, NT_STATUS_FT_ORPHANING}, {
-	ERRHRD, ERRgeneral, 0xc000016e}, {
+	ERRHRD, ERRgeneral, NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT}, {
 	ERRHRD, ERRgeneral, 0xc000016f}, {
 	ERRHRD, ERRgeneral, 0xc0000170}, {
 	ERRHRD, ERRgeneral, 0xc0000171}, {
-- 
2.43.0

[PATCH 06/17] smb/client: add NT_STATUS_VOLUME_DISMOUNTED

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_VOLUME_DISMOUNTED.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 1c5d7199f556..28b6320f2d21 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -679,6 +679,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_QUOTA_LIST_INCONSISTENT",
 	 NT_STATUS_QUOTA_LIST_INCONSISTENT},
 	{"NT_STATUS_FILE_IS_OFFLINE", NT_STATUS_FILE_IS_OFFLINE},
+	{"NT_STATUS_VOLUME_DISMOUNTED", NT_STATUS_VOLUME_DISMOUNTED},
 	{"NT_STATUS_NOT_A_REPARSE_POINT", NT_STATUS_NOT_A_REPARSE_POINT},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 1aa4bc394405..2056831ea631 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -550,6 +550,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_TOO_MANY_LINKS (0xC0000000 | 0x0265)
 #define NT_STATUS_QUOTA_LIST_INCONSISTENT (0xC0000000 | 0x0266)
 #define NT_STATUS_FILE_IS_OFFLINE (0xC0000000 | 0x0267)
+#define NT_STATUS_VOLUME_DISMOUNTED (0xC0000000 | 0x026e)
 #define NT_STATUS_NOT_A_REPARSE_POINT (0xC0000000 | 0x0275)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 3085e2084f99..164b721c7dda 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -658,7 +658,7 @@ static const struct {
 	ERRDOS, ErrTooManyLinks, NT_STATUS_TOO_MANY_LINKS}, {
 	ERRHRD, ERRgeneral, NT_STATUS_QUOTA_LIST_INCONSISTENT}, {
 	ERRHRD, ERRgeneral, NT_STATUS_FILE_IS_OFFLINE}, {
-	ERRDOS, 21, 0xc000026e}, {
+	ERRDOS, 21, NT_STATUS_VOLUME_DISMOUNTED}, {
 	ERRDOS, 161, 0xc0000281}, {
 	ERRDOS, ERRnoaccess, 0xc000028a}, {
 	ERRDOS, ERRnoaccess, 0xc000028b}, {
-- 
2.43.0

[PATCH 07/17] smb/client: add NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_DIRECTORY_IS_A_REPARSE_POINT.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 2 ++
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 28b6320f2d21..679ff5d600cf 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -681,6 +681,8 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_FILE_IS_OFFLINE", NT_STATUS_FILE_IS_OFFLINE},
 	{"NT_STATUS_VOLUME_DISMOUNTED", NT_STATUS_VOLUME_DISMOUNTED},
 	{"NT_STATUS_NOT_A_REPARSE_POINT", NT_STATUS_NOT_A_REPARSE_POINT},
+	{"NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT",
+	 NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 2056831ea631..087f970c6ceb 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -552,6 +552,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_FILE_IS_OFFLINE (0xC0000000 | 0x0267)
 #define NT_STATUS_VOLUME_DISMOUNTED (0xC0000000 | 0x026e)
 #define NT_STATUS_NOT_A_REPARSE_POINT (0xC0000000 | 0x0275)
+#define NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT (0xC0000000 | 0x0281)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 164b721c7dda..e91d9a22d843 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -659,7 +659,7 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_QUOTA_LIST_INCONSISTENT}, {
 	ERRHRD, ERRgeneral, NT_STATUS_FILE_IS_OFFLINE}, {
 	ERRDOS, 21, NT_STATUS_VOLUME_DISMOUNTED}, {
-	ERRDOS, 161, 0xc0000281}, {
+	ERRDOS, 161, NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT}, {
 	ERRDOS, ERRnoaccess, 0xc000028a}, {
 	ERRDOS, ERRnoaccess, 0xc000028b}, {
 	ERRHRD, ERRgeneral, 0xc000028c}, {
-- 
2.43.0

[PATCH 08/17] smb/client: add NT_STATUS_ENCRYPTION_FAILED

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_ENCRYPTION_FAILED.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 679ff5d600cf..38f28be12c30 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -683,6 +683,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_NOT_A_REPARSE_POINT", NT_STATUS_NOT_A_REPARSE_POINT},
 	{"NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT",
 	 NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT},
+	{"NT_STATUS_ENCRYPTION_FAILED", NT_STATUS_ENCRYPTION_FAILED},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 087f970c6ceb..a5595f234b0c 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -553,6 +553,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_VOLUME_DISMOUNTED (0xC0000000 | 0x026e)
 #define NT_STATUS_NOT_A_REPARSE_POINT (0xC0000000 | 0x0275)
 #define NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT (0xC0000000 | 0x0281)
+#define NT_STATUS_ENCRYPTION_FAILED (0xC0000000 | 0x028a)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index e91d9a22d843..175732910909 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -660,7 +660,7 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_FILE_IS_OFFLINE}, {
 	ERRDOS, 21, NT_STATUS_VOLUME_DISMOUNTED}, {
 	ERRDOS, 161, NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT}, {
-	ERRDOS, ERRnoaccess, 0xc000028a}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_ENCRYPTION_FAILED}, {
 	ERRDOS, ERRnoaccess, 0xc000028b}, {
 	ERRHRD, ERRgeneral, 0xc000028c}, {
 	ERRDOS, ERRnoaccess, 0xc000028d}, {
-- 
2.43.0

[PATCH 09/17] smb/client: add NT_STATUS_DECRYPTION_FAILED

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_DECRYPTION_FAILED.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 38f28be12c30..fc81174aef5f 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -684,6 +684,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT",
 	 NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT},
 	{"NT_STATUS_ENCRYPTION_FAILED", NT_STATUS_ENCRYPTION_FAILED},
+	{"NT_STATUS_DECRYPTION_FAILED", NT_STATUS_DECRYPTION_FAILED},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index a5595f234b0c..8b7d108ed9e4 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -554,6 +554,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_NOT_A_REPARSE_POINT (0xC0000000 | 0x0275)
 #define NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT (0xC0000000 | 0x0281)
 #define NT_STATUS_ENCRYPTION_FAILED (0xC0000000 | 0x028a)
+#define NT_STATUS_DECRYPTION_FAILED (0xC0000000 | 0x028b)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 175732910909..32a57ac2c789 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -661,7 +661,7 @@ static const struct {
 	ERRDOS, 21, NT_STATUS_VOLUME_DISMOUNTED}, {
 	ERRDOS, 161, NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_ENCRYPTION_FAILED}, {
-	ERRDOS, ERRnoaccess, 0xc000028b}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_DECRYPTION_FAILED}, {
 	ERRHRD, ERRgeneral, 0xc000028c}, {
 	ERRDOS, ERRnoaccess, 0xc000028d}, {
 	ERRDOS, ERRnoaccess, 0xc000028e}, {
-- 
2.43.0

[PATCH 10/17] smb/client: add NT_STATUS_RANGE_NOT_FOUND

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_RANGE_NOT_FOUND.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index fc81174aef5f..bdc9f6f84df8 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -685,6 +685,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	 NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT},
 	{"NT_STATUS_ENCRYPTION_FAILED", NT_STATUS_ENCRYPTION_FAILED},
 	{"NT_STATUS_DECRYPTION_FAILED", NT_STATUS_DECRYPTION_FAILED},
+	{"NT_STATUS_RANGE_NOT_FOUND", NT_STATUS_RANGE_NOT_FOUND},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 8b7d108ed9e4..56bd494b480d 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -555,6 +555,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT (0xC0000000 | 0x0281)
 #define NT_STATUS_ENCRYPTION_FAILED (0xC0000000 | 0x028a)
 #define NT_STATUS_DECRYPTION_FAILED (0xC0000000 | 0x028b)
+#define NT_STATUS_RANGE_NOT_FOUND (0xC0000000 | 0x028c)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 32a57ac2c789..4506fe3fd203 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -662,7 +662,7 @@ static const struct {
 	ERRDOS, 161, NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_ENCRYPTION_FAILED}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_DECRYPTION_FAILED}, {
-	ERRHRD, ERRgeneral, 0xc000028c}, {
+	ERRHRD, ERRgeneral, NT_STATUS_RANGE_NOT_FOUND}, {
 	ERRDOS, ERRnoaccess, 0xc000028d}, {
 	ERRDOS, ERRnoaccess, 0xc000028e}, {
 	ERRDOS, ERRnoaccess, 0xc000028f}, {
-- 
2.43.0

[PATCH 11/17] smb/client: add NT_STATUS_NO_RECOVERY_POLICY

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_NO_RECOVERY_POLICY.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index bdc9f6f84df8..5e3efc3805a1 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -686,6 +686,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_ENCRYPTION_FAILED", NT_STATUS_ENCRYPTION_FAILED},
 	{"NT_STATUS_DECRYPTION_FAILED", NT_STATUS_DECRYPTION_FAILED},
 	{"NT_STATUS_RANGE_NOT_FOUND", NT_STATUS_RANGE_NOT_FOUND},
+	{"NT_STATUS_NO_RECOVERY_POLICY", NT_STATUS_NO_RECOVERY_POLICY},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 56bd494b480d..c0f317948714 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -556,6 +556,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_ENCRYPTION_FAILED (0xC0000000 | 0x028a)
 #define NT_STATUS_DECRYPTION_FAILED (0xC0000000 | 0x028b)
 #define NT_STATUS_RANGE_NOT_FOUND (0xC0000000 | 0x028c)
+#define NT_STATUS_NO_RECOVERY_POLICY (0xC0000000 | 0x028d)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 4506fe3fd203..02a2233ea0dc 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -663,7 +663,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, NT_STATUS_ENCRYPTION_FAILED}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_DECRYPTION_FAILED}, {
 	ERRHRD, ERRgeneral, NT_STATUS_RANGE_NOT_FOUND}, {
-	ERRDOS, ERRnoaccess, 0xc000028d}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_NO_RECOVERY_POLICY}, {
 	ERRDOS, ERRnoaccess, 0xc000028e}, {
 	ERRDOS, ERRnoaccess, 0xc000028f}, {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
-- 
2.43.0

[PATCH 12/17] smb/client: add NT_STATUS_NO_EFS

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_NO_EFS.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 5e3efc3805a1..5d649222a3be 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -687,6 +687,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_DECRYPTION_FAILED", NT_STATUS_DECRYPTION_FAILED},
 	{"NT_STATUS_RANGE_NOT_FOUND", NT_STATUS_RANGE_NOT_FOUND},
 	{"NT_STATUS_NO_RECOVERY_POLICY", NT_STATUS_NO_RECOVERY_POLICY},
+	{"NT_STATUS_NO_EFS", NT_STATUS_NO_EFS},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index c0f317948714..9af4a21e1d9b 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -557,6 +557,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_DECRYPTION_FAILED (0xC0000000 | 0x028b)
 #define NT_STATUS_RANGE_NOT_FOUND (0xC0000000 | 0x028c)
 #define NT_STATUS_NO_RECOVERY_POLICY (0xC0000000 | 0x028d)
+#define NT_STATUS_NO_EFS (0xC0000000 | 0x028e)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 02a2233ea0dc..cef67ea5720e 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -664,7 +664,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, NT_STATUS_DECRYPTION_FAILED}, {
 	ERRHRD, ERRgeneral, NT_STATUS_RANGE_NOT_FOUND}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_RECOVERY_POLICY}, {
-	ERRDOS, ERRnoaccess, 0xc000028e}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_NO_EFS}, {
 	ERRDOS, ERRnoaccess, 0xc000028f}, {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
-- 
2.43.0

[PATCH 13/17] smb/client: add NT_STATUS_WRONG_EFS

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_WRONG_EFS.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 5d649222a3be..9f0a3283edc0 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -688,6 +688,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_RANGE_NOT_FOUND", NT_STATUS_RANGE_NOT_FOUND},
 	{"NT_STATUS_NO_RECOVERY_POLICY", NT_STATUS_NO_RECOVERY_POLICY},
 	{"NT_STATUS_NO_EFS", NT_STATUS_NO_EFS},
+	{"NT_STATUS_WRONG_EFS", NT_STATUS_WRONG_EFS},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 9af4a21e1d9b..72fb68a13c49 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -558,6 +558,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_RANGE_NOT_FOUND (0xC0000000 | 0x028c)
 #define NT_STATUS_NO_RECOVERY_POLICY (0xC0000000 | 0x028d)
 #define NT_STATUS_NO_EFS (0xC0000000 | 0x028e)
+#define NT_STATUS_WRONG_EFS (0xC0000000 | 0x028f)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index cef67ea5720e..7af766b81eaf 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -665,7 +665,7 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_RANGE_NOT_FOUND}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_RECOVERY_POLICY}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_EFS}, {
-	ERRDOS, ERRnoaccess, 0xc000028f}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_WRONG_EFS}, {
 	ERRDOS, ERRnoaccess, 0xc0000290}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
-- 
2.43.0

[PATCH 14/17] smb/client: add NT_STATUS_NO_USER_KEYS

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_NO_USER_KEYS.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 9f0a3283edc0..256f14209f56 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -689,6 +689,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_NO_RECOVERY_POLICY", NT_STATUS_NO_RECOVERY_POLICY},
 	{"NT_STATUS_NO_EFS", NT_STATUS_NO_EFS},
 	{"NT_STATUS_WRONG_EFS", NT_STATUS_WRONG_EFS},
+	{"NT_STATUS_NO_USER_KEYS", NT_STATUS_NO_USER_KEYS},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index 72fb68a13c49..b34e522e6f87 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -559,6 +559,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_NO_RECOVERY_POLICY (0xC0000000 | 0x028d)
 #define NT_STATUS_NO_EFS (0xC0000000 | 0x028e)
 #define NT_STATUS_WRONG_EFS (0xC0000000 | 0x028f)
+#define NT_STATUS_NO_USER_KEYS (0xC0000000 | 0x0290)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 7af766b81eaf..0e1c8763afff 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -666,7 +666,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_RECOVERY_POLICY}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_EFS}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_WRONG_EFS}, {
-	ERRDOS, ERRnoaccess, 0xc0000290}, {
+	ERRDOS, ERRnoaccess, NT_STATUS_NO_USER_KEYS}, {
 	ERRDOS, ERRbadfunc, 0xc000029c}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
 	ERRDOS, ERRunknownlevel, NT_STATUS_OS2_INVALID_LEVEL}, {
-- 
2.43.0

[PATCH 15/17] smb/client: add NT_STATUS_VOLUME_NOT_UPGRADED

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

See MS-ERREf 2.3.1 STATUS_VOLUME_NOT_UPGRADED.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/nterr.c        | 1 +
 fs/smb/client/nterr.h        | 1 +
 fs/smb/client/smb1maperror.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/smb/client/nterr.c b/fs/smb/client/nterr.c
index 256f14209f56..ab5a2119efd0 100644
--- a/fs/smb/client/nterr.c
+++ b/fs/smb/client/nterr.c
@@ -690,6 +690,7 @@ const struct nt_err_code_struct nt_errs[] = {
 	{"NT_STATUS_NO_EFS", NT_STATUS_NO_EFS},
 	{"NT_STATUS_WRONG_EFS", NT_STATUS_WRONG_EFS},
 	{"NT_STATUS_NO_USER_KEYS", NT_STATUS_NO_USER_KEYS},
+	{"NT_STATUS_VOLUME_NOT_UPGRADED", NT_STATUS_VOLUME_NOT_UPGRADED},
 	{"NT_STATUS_NETWORK_SESSION_EXPIRED", NT_STATUS_NETWORK_SESSION_EXPIRED},
 	{"NT_STATUS_NO_MORE_ENTRIES", NT_STATUS_NO_MORE_ENTRIES},
 	{"NT_STATUS_MORE_ENTRIES", NT_STATUS_MORE_ENTRIES},
diff --git a/fs/smb/client/nterr.h b/fs/smb/client/nterr.h
index b34e522e6f87..b04cd0d786b1 100644
--- a/fs/smb/client/nterr.h
+++ b/fs/smb/client/nterr.h
@@ -560,6 +560,7 @@ extern const struct nt_err_code_struct nt_errs[];
 #define NT_STATUS_NO_EFS (0xC0000000 | 0x028e)
 #define NT_STATUS_WRONG_EFS (0xC0000000 | 0x028f)
 #define NT_STATUS_NO_USER_KEYS (0xC0000000 | 0x0290)
+#define NT_STATUS_VOLUME_NOT_UPGRADED (0xC0000000 | 0x029c)
 #define NT_STATUS_NETWORK_SESSION_EXPIRED  (0xC0000000 | 0x035c)
 #define NT_STATUS_NO_SUCH_JOB (0xC0000000 | 0xEDE)	/* scheduler */
 #define NT_STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP (0xC0000000 | 0x5D0000)
diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 0e1c8763afff..2de241f89cb6 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -667,7 +667,7 @@ static const struct {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_EFS}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_WRONG_EFS}, {
 	ERRDOS, ERRnoaccess, NT_STATUS_NO_USER_KEYS}, {
-	ERRDOS, ERRbadfunc, 0xc000029c}, {
+	ERRDOS, ERRbadfunc, NT_STATUS_VOLUME_NOT_UPGRADED}, {
 	ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, {
 	ERRDOS, ERRunknownlevel, NT_STATUS_OS2_INVALID_LEVEL}, {
 	0, 0, 0 }
-- 
2.43.0

[PATCH 16/17] smb/client: remove some literal NT error codes from ntstatus_to_dos_map

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

When an NT error code is not in ntstatus_to_dos_map, ntstatus_to_dos()
will return the default ERRHRD and ERRGENERAL.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/smb1maperror.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 2de241f89cb6..0924ebebb65a 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -502,9 +502,6 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_SHARED_IRQ_BUSY}, {
 	ERRHRD, ERRgeneral, NT_STATUS_FT_ORPHANING}, {
 	ERRHRD, ERRgeneral, NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT}, {
-	ERRHRD, ERRgeneral, 0xc000016f}, {
-	ERRHRD, ERRgeneral, 0xc0000170}, {
-	ERRHRD, ERRgeneral, 0xc0000171}, {
 	ERRHRD, ERRgeneral, NT_STATUS_PARTITION_FAILURE}, {
 	ERRHRD, ERRgeneral, NT_STATUS_INVALID_BLOCK_LENGTH}, {
 	ERRHRD, ERRgeneral, NT_STATUS_DEVICE_NOT_PARTITIONED}, {
@@ -512,7 +509,6 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_UNABLE_TO_UNLOAD_MEDIA}, {
 	ERRHRD, ERRgeneral, NT_STATUS_EOM_OVERFLOW}, {
 	ERRHRD, ERRgeneral, NT_STATUS_NO_MEDIA}, {
-	ERRHRD, ERRgeneral, 0xc0000179}, {
 	ERRHRD, ERRgeneral, NT_STATUS_NO_SUCH_MEMBER}, {
 	ERRHRD, ERRgeneral, NT_STATUS_INVALID_MEMBER}, {
 	ERRHRD, ERRgeneral, NT_STATUS_KEY_DELETED}, {
@@ -628,12 +624,6 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_LOGIN_TIME_RESTRICTION}, {
 	ERRHRD, ERRgeneral, NT_STATUS_LOGIN_WKSTA_RESTRICTION}, {
 	ERRDOS, 193, NT_STATUS_IMAGE_MP_UP_MISMATCH}, {
-	ERRHRD, ERRgeneral, 0xc000024a}, {
-	ERRHRD, ERRgeneral, 0xc000024b}, {
-	ERRHRD, ERRgeneral, 0xc000024c}, {
-	ERRHRD, ERRgeneral, 0xc000024d}, {
-	ERRHRD, ERRgeneral, 0xc000024e}, {
-	ERRHRD, ERRgeneral, 0xc000024f}, {
 	ERRHRD, ERRgeneral, NT_STATUS_INSUFFICIENT_LOGON_INFO}, {
 	ERRHRD, ERRgeneral, NT_STATUS_BAD_DLL_ENTRYPOINT}, {
 	ERRHRD, ERRgeneral, NT_STATUS_BAD_SERVICE_ENTRYPOINT}, {
@@ -647,7 +637,6 @@ static const struct {
 	ERRHRD, ERRgeneral, NT_STATUS_PWD_TOO_SHORT}, {
 	ERRHRD, ERRgeneral, NT_STATUS_PWD_TOO_RECENT}, {
 	ERRHRD, ERRgeneral, NT_STATUS_PWD_HISTORY_CONFLICT}, {
-	ERRHRD, ERRgeneral, 0xc000025d}, {
 	ERRHRD, ERRgeneral, NT_STATUS_PLUGPLAY_NO_DEVICE}, {
 	ERRHRD, ERRgeneral, NT_STATUS_UNSUPPORTED_COMPRESSION}, {
 	ERRHRD, ERRgeneral, NT_STATUS_INVALID_HW_PROFILE}, {
-- 
2.43.0

[PATCH 17/17] smb/client: remove useless comment in mapping_table_ERRSRV

[chenxiaosong.chenxiaosong]

From: Huiwen He <hehuiwen@kylinos.cn>

These array elements have already been defined.

Signed-off-by: Huiwen He <hehuiwen@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
---
 fs/smb/client/smb1maperror.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c
index 0924ebebb65a..e8aa7d44cbc6 100644
--- a/fs/smb/client/smb1maperror.c
+++ b/fs/smb/client/smb1maperror.c
@@ -94,10 +94,6 @@ static const struct smb_to_posix_error mapping_table_ERRSRV[] = {
 	{ERRusestd, -EIO},
 	{ERR_NOTIFY_ENUM_DIR, -ENOBUFS},
 	{ERRnoSuchUser, -EACCES},
-/*	{ERRaccountexpired, -EACCES},
-	{ERRbadclient, -EACCES},
-	{ERRbadLogonTime, -EACCES},
-	{ERRpasswordExpired, -EACCES},*/
 	{ERRaccountexpired, -EKEYEXPIRED},
 	{ERRbadclient, -EACCES},
 	{ERRbadLogonTime, -EACCES},
-- 
2.43.0

Re: [PATCH 00/17] smb/client: update SMB1 maperror

[Steve French]

tentatively merged into cifs-2.6.git for-next pending more review and testing

On Wed, Jan 21, 2026 at 5:50 AM <chenxiaosong.chenxiaosong@linux.dev> wrote:
>
> From: ChenXiaoSong <chenxiaosong@kylinos.cn>
>
> My dear team member, Huiwen He, added some NT error code macro definitions
> and updated some arrays of SMB1 maperror. He will also update the relevant
> code in the userspace Samba repository.
>
> This is a preparation to improve the search speed of the SMB1 maperror.
> Huiwen He and I will soon complete the patches of improving the search
> speed of the SMB1 maperror (I have already sent the first version).
>
> Huiwen He (17):
>   smb/client: map NT_STATUS_INVALID_INFO_CLASS to ERRbadpipe
>   smb/client: add NT_STATUS_OS2_INVALID_LEVEL
>   smb/client: rename ERRinvlevel to ERRunknownlevel
>   smb/client: add NT_STATUS_VARIABLE_NOT_FOUND
>   smb/client: add NT_STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT
>   smb/client: add NT_STATUS_VOLUME_DISMOUNTED
>   smb/client: add NT_STATUS_DIRECTORY_IS_A_REPARSE_POINT
>   smb/client: add NT_STATUS_ENCRYPTION_FAILED
>   smb/client: add NT_STATUS_DECRYPTION_FAILED
>   smb/client: add NT_STATUS_RANGE_NOT_FOUND
>   smb/client: add NT_STATUS_NO_RECOVERY_POLICY
>   smb/client: add NT_STATUS_NO_EFS
>   smb/client: add NT_STATUS_WRONG_EFS
>   smb/client: add NT_STATUS_NO_USER_KEYS
>   smb/client: add NT_STATUS_VOLUME_NOT_UPGRADED
>   smb/client: remove some literal NT error codes from
>     ntstatus_to_dos_map
>   smb/client: remove useless comment in mapping_table_ERRSRV
>
>  fs/smb/client/nterr.c        | 15 ++++++++++++
>  fs/smb/client/nterr.h        | 13 +++++++++++
>  fs/smb/client/smb1maperror.c | 45 ++++++++++++------------------------
>  fs/smb/client/smberr.h       |  2 +-
>  4 files changed, 44 insertions(+), 31 deletions(-)
>
> --
> 2.43.0
>


-- 
Thanks,

Steve