smb: move SMB1_PROTO_NUMBER to common/smbglob.h

Replace the constant of client with SMB1_PROTO_NUMBER, then move the
macro definition from server/smb_common.h to common/smbglob.h.

Co-developed-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ChenXiaoSong <chenxiaosong@kylinos.cn>
Signed-off-by: ZhangGuoDong <zhangguodong@kylinos.cn>
Suggested-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/misc.c b/fs/smb/client/misc.c
index e10123d8cd7d93af4cca37ef55df2ac4679f7dfe..340c44dc7b5bf434ce9b427f40fbc0ecef5f3a00 100644 (file)
--- a/fs/smb/client/misc.c
+++ b/fs/smb/client/misc.c
@@ -318,7 +318,7 @@ static int
 check_smb_hdr(struct smb_hdr *smb)
 {
        /* does it have the right SMB "signature" ? */
-       if (*(__le32 *) smb->Protocol != cpu_to_le32(0x424d53ff)) {
+       if (*(__le32 *) smb->Protocol != SMB1_PROTO_NUMBER) {
                cifs_dbg(VFS, "Bad protocol string signature header 0x%x\n",
                         *(unsigned int *)smb->Protocol);
                return 1;

diff --git a/fs/smb/common/smbglob.h b/fs/smb/common/smbglob.h
index b258199b0d754a42bdd8374ea6afdee1d06dab21..fa3d30dc602256ba0969e98bf6689a54ddcd0d33 100644 (file)
--- a/fs/smb/common/smbglob.h
+++ b/fs/smb/common/smbglob.h
@@ -9,6 +9,8 @@
 #ifndef _COMMON_SMB_GLOB_H
 #define _COMMON_SMB_GLOB_H
 
+#define SMB1_PROTO_NUMBER              cpu_to_le32(0x424d53ff)
+
 struct smb_version_values {
        char            *version_string;
        __u16           protocol_id;

diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h
index ff3e441da12578760cde520943b2dcf4cbaff294..0e291fe2d19068704143802abdb721d2c601b596 100644 (file)
--- a/fs/smb/server/smb_common.h
+++ b/fs/smb/server/smb_common.h
@@ -151,7 +151,6 @@
                FILE_EXECUTE | FILE_DELETE_CHILD | \
                FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES)
 
-#define SMB1_PROTO_NUMBER              cpu_to_le32(0x424d53ff)
 #define SMB_COM_NEGOTIATE              0x72
 #define SMB1_CLIENT_GUID_SIZE          (16)