Skip to content

Commit 78181a5

Browse files
ChenXiaoSongsmfrench
authored andcommitted
smb: move SMB2 Status code to common header file
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 <[email protected]> Acked-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent b51174d commit 78181a5

File tree

15 files changed

+15
-1835
lines changed

15 files changed

+15
-1835
lines changed

fs/smb/client/smb2file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "cifs_unicode.h"
2222
#include "fscache.h"
2323
#include "smb2proto.h"
24-
#include "smb2status.h"
24+
#include "../common/smb2status.h"
2525

2626
static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov)
2727
{

fs/smb/client/smb2inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "smb2pdu.h"
2525
#include "smb2proto.h"
2626
#include "cached_dir.h"
27-
#include "smb2status.h"
27+
#include "../common/smb2status.h"
2828

2929
static struct reparse_data_buffer *reparse_buf_ptr(struct kvec *iov)
3030
{

fs/smb/client/smb2maperror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "cifs_debug.h"
1313
#include "smb2pdu.h"
1414
#include "smb2proto.h"
15-
#include "smb2status.h"
15+
#include "../common/smb2status.h"
1616
#include "smb2glob.h"
1717
#include "trace.h"
1818

fs/smb/client/smb2misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "smb2proto.h"
1414
#include "cifs_debug.h"
1515
#include "cifs_unicode.h"
16-
#include "smb2status.h"
16+
#include "../common/smb2status.h"
1717
#include "smb2glob.h"
1818
#include "nterr.h"
1919
#include "cached_dir.h"

fs/smb/client/smb2ops.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "cifsproto.h"
2222
#include "cifs_debug.h"
2323
#include "cifs_unicode.h"
24-
#include "smb2status.h"
24+
#include "../common/smb2status.h"
2525
#include "smb2glob.h"
2626
#include "cifs_ioctl.h"
2727
#include "smbdirect.h"

fs/smb/client/smb2pdu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "cifs_unicode.h"
3333
#include "cifs_debug.h"
3434
#include "ntlmssp.h"
35-
#include "smb2status.h"
35+
#include "../common/smb2status.h"
3636
#include "smb2glob.h"
3737
#include "cifspdu.h"
3838
#include "cifs_spnego.h"

fs/smb/client/smb2transport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "cifsproto.h"
2424
#include "smb2proto.h"
2525
#include "cifs_debug.h"
26-
#include "smb2status.h"
26+
#include "../common/smb2status.h"
2727
#include "smb2glob.h"
2828

2929
static int

fs/smb/client/smb2status.h renamed to fs/smb/common/smb2status.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,3 +1769,5 @@ struct ntstatus {
17691769
#define STATUS_IPSEC_INVALID_PACKET cpu_to_le32(0xC0360005)
17701770
#define STATUS_IPSEC_INTEGRITY_CHECK_FAILED cpu_to_le32(0xC0360006)
17711771
#define STATUS_IPSEC_CLEAR_TEXT_DROP cpu_to_le32(0xC0360007)
1772+
#define STATUS_NO_PREAUTH_INTEGRITY_HASH_OVERLAP cpu_to_le32(0xC05D0000)
1773+
#define STATUS_INVALID_LOCK_RANGE cpu_to_le32(0xC00001a1)

fs/smb/server/oplock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "oplock.h"
1111

1212
#include "smb_common.h"
13-
#include "smbstatus.h"
13+
#include "../common/smb2status.h"
1414
#include "connection.h"
1515
#include "mgmt/user_session.h"
1616
#include "mgmt/share_config.h"

fs/smb/server/server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "server.h"
1717
#include "smb_common.h"
18-
#include "smbstatus.h"
18+
#include "../common/smb2status.h"
1919
#include "connection.h"
2020
#include "transport_ipc.h"
2121
#include "mgmt/user_session.h"

0 commit comments

Comments
 (0)