kevin/linux
1
Fork 0
Code

smb: move SMB2 Status code to common header file

Browse Source 
There are only 4 different definitions between the client and server:

  - STATUS_SERVER_UNAVAILABLE: from client/smb2status.h
  - STATUS_FILE_NOT_AVAILABLE: from client/smb2status.h
  - STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP: from server/smbstatus.h
  - STATUS_INVALID_LOCK_RANGE: from server/smbstatus.h

Rename client/smb2status.h to common/smb2status.h, and merge the
2 different definitions of server to common header file.

Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
ChenXiaoSong 2024-08-22 08:21:00 +00:00 committed by Steve French
parent b51174da74
commit 78181a5504
15 changed files with 15 additions and 1835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/smb/client/smb2file.c
View File

@ -21,7 +21,7 @@
#include "cifs_unicode.h" #include "cifs_unicode.h"
#include "fscache.h" #include "fscache.h"
#include "smb2proto.h" #include "smb2proto.h"
#include "smb2status.h" #include "../common/smb2status.h"
static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov) static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov)
{ {

2
fs/smb/client/smb2inode.c
View File

@ -24,7 +24,7 @@
#include "smb2pdu.h" #include "smb2pdu.h"
#include "smb2proto.h" #include "smb2proto.h"
#include "cached_dir.h" #include "cached_dir.h"
#include "smb2status.h" #include "../common/smb2status.h"
static struct reparse_data_buffer *reparse_buf_ptr(struct kvec *iov) static struct reparse_data_buffer *reparse_buf_ptr(struct kvec *iov)
{ {

2
fs/smb/client/smb2maperror.c
View File

@ -12,7 +12,7 @@
#include "cifs_debug.h" #include "cifs_debug.h"
#include "smb2pdu.h" #include "smb2pdu.h"
#include "smb2proto.h" #include "smb2proto.h"
#include "smb2status.h" #include "../common/smb2status.h"
#include "smb2glob.h" #include "smb2glob.h"
#include "trace.h" #include "trace.h"

2
fs/smb/client/smb2misc.c
View File

@ -13,7 +13,7 @@
#include "smb2proto.h" #include "smb2proto.h"
#include "cifs_debug.h" #include "cifs_debug.h"
#include "cifs_unicode.h" #include "cifs_unicode.h"
#include "smb2status.h" #include "../common/smb2status.h"
#include "smb2glob.h" #include "smb2glob.h"
#include "nterr.h" #include "nterr.h"
#include "cached_dir.h" #include "cached_dir.h"

2
fs/smb/client/smb2ops.c
View File

@ -21,7 +21,7 @@
#include "cifsproto.h" #include "cifsproto.h"
#include "cifs_debug.h" #include "cifs_debug.h"
#include "cifs_unicode.h" #include "cifs_unicode.h"
#include "smb2status.h" #include "../common/smb2status.h"
#include "smb2glob.h" #include "smb2glob.h"
#include "cifs_ioctl.h" #include "cifs_ioctl.h"
#include "smbdirect.h" #include "smbdirect.h"

2
fs/smb/client/smb2pdu.c
View File

@ -32,7 +32,7 @@
#include "cifs_unicode.h" #include "cifs_unicode.h"
#include "cifs_debug.h" #include "cifs_debug.h"
#include "ntlmssp.h" #include "ntlmssp.h"
#include "smb2status.h" #include "../common/smb2status.h"
#include "smb2glob.h" #include "smb2glob.h"
#include "cifspdu.h" #include "cifspdu.h"
#include "cifs_spnego.h" #include "cifs_spnego.h"

2
fs/smb/client/smb2transport.c
View File

@ -23,7 +23,7 @@
#include "cifsproto.h" #include "cifsproto.h"
#include "smb2proto.h" #include "smb2proto.h"
#include "cifs_debug.h" #include "cifs_debug.h"
#include "smb2status.h" #include "../common/smb2status.h"
#include "smb2glob.h" #include "smb2glob.h"
static int static int

2
fs/smb/client/smb2status.h → fs/smb/common/smb2status.h
View File

@ -1769,3 +1769,5 @@ struct ntstatus {
#define STATUS_IPSEC_INVALID_PACKET cpu_to_le32(0xC0360005) #define STATUS_IPSEC_INVALID_PACKET cpu_to_le32(0xC0360005)
#define STATUS_IPSEC_INTEGRITY_CHECK_FAILED cpu_to_le32(0xC0360006) #define STATUS_IPSEC_INTEGRITY_CHECK_FAILED cpu_to_le32(0xC0360006)
#define STATUS_IPSEC_CLEAR_TEXT_DROP cpu_to_le32(0xC0360007) #define STATUS_IPSEC_CLEAR_TEXT_DROP cpu_to_le32(0xC0360007)
#define STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)
#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001a1)

2
fs/smb/server/oplock.c
View File

@ -10,7 +10,7 @@
#include "oplock.h" #include "oplock.h"
#include "smb_common.h" #include "smb_common.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "connection.h" #include "connection.h"
#include "mgmt/user_session.h" #include "mgmt/user_session.h"
#include "mgmt/share_config.h" #include "mgmt/share_config.h"

2
fs/smb/server/server.c
View File

@ -15,7 +15,7 @@
#include "server.h" #include "server.h"
#include "smb_common.h" #include "smb_common.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "connection.h" #include "connection.h"
#include "transport_ipc.h" #include "transport_ipc.h"
#include "mgmt/user_session.h" #include "mgmt/user_session.h"

2
fs/smb/server/smb2misc.c
View File

@ -7,7 +7,7 @@
#include "glob.h" #include "glob.h"
#include "nterr.h" #include "nterr.h"
#include "smb_common.h" #include "smb_common.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "mgmt/user_session.h" #include "mgmt/user_session.h"
#include "connection.h" #include "connection.h"

2
fs/smb/server/smb2pdu.c
View File

@ -30,7 +30,7 @@
#include "server.h" #include "server.h"
#include "smb_common.h" #include "smb_common.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "ksmbd_work.h" #include "ksmbd_work.h"
#include "mgmt/user_config.h" #include "mgmt/user_config.h"
#include "mgmt/share_config.h" #include "mgmt/share_config.h"

2
fs/smb/server/smb_common.c
View File

@ -9,7 +9,7 @@
#include "smb_common.h" #include "smb_common.h"
#include "server.h" #include "server.h"
#include "misc.h" #include "misc.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "connection.h" #include "connection.h"
#include "ksmbd_work.h" #include "ksmbd_work.h"
#include "mgmt/user_session.h" #include "mgmt/user_session.h"

1822
fs/smb/server/smbstatus.h
View File

File diff suppressed because it is too large Load Diff

2
fs/smb/server/transport_rdma.c
View File

@ -21,7 +21,7 @@
#include "glob.h" #include "glob.h"
#include "connection.h" #include "connection.h"
#include "smb_common.h" #include "smb_common.h"
#include "smbstatus.h" #include "../common/smb2status.h"
#include "transport_rdma.h" #include "transport_rdma.h"
#define SMB_DIRECT_PORT_IWARP 5445 #define SMB_DIRECT_PORT_IWARP 5445