From: ZhangGuoDong <zhangguodong@kylinos.cn>
Date: Mon, 27 Oct 2025 07:12:53 +0000 (+0800)
Subject: smb: rename common/cifsglob.h to common/smbglob.h
X-Git-Tag: v6.19-rc1~163^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94b955167e3b11372e314f45f4b2fbf4f92493b9;p=thirdparty%2Fkernel%2Flinux.git

smb: rename common/cifsglob.h to common/smbglob.h

"cifs" is a legacy name, rename it to "smbglob.h" according to
Namjae's suggestions.

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

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 203e2aaa3c250..8fd9aa7e2009e 100644
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -24,7 +24,7 @@
 #include "cifsacl.h"
 #include <crypto/internal/hash.h>
 #include <uapi/linux/cifs/cifs_mount.h>
-#include "../common/cifsglob.h"
+#include "../common/smbglob.h"
 #include "../common/smb2pdu.h"
 #include "smb2pdu.h"
 #include <linux/filelock.h>
diff --git a/fs/smb/common/cifsglob.h b/fs/smb/common/smbglob.h
similarity index 89%
rename from fs/smb/common/cifsglob.h
rename to fs/smb/common/smbglob.h
index 00fd215e3eb54..c51d227977c45 100644
--- a/fs/smb/common/cifsglob.h
+++ b/fs/smb/common/smbglob.h
@@ -6,8 +6,8 @@
  *              Jeremy Allison (jra@samba.org)
  *
  */
-#ifndef _COMMON_CIFS_GLOB_H
-#define _COMMON_CIFS_GLOB_H
+#ifndef _COMMON_SMB_GLOB_H
+#define _COMMON_SMB_GLOB_H
 
 static inline void inc_rfc1001_len(void *buf, int count)
 {
@@ -27,4 +27,4 @@ static inline void inc_rfc1001_len(void *buf, int count)
 
 #define CIFS_DEFAULT_IOSIZE (1024 * 1024)
 
-#endif	/* _COMMON_CIFS_GLOB_H */
+#endif	/* _COMMON_SMB_GLOB_H */
diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h
index 9fa1da647d90e..560308e0d042f 100644
--- a/fs/smb/server/smb_common.h
+++ b/fs/smb/server/smb_common.h
@@ -10,7 +10,7 @@
 
 #include "glob.h"
 #include "nterr.h"
-#include "../common/cifsglob.h"
+#include "../common/smbglob.h"
 #include "../common/smb2pdu.h"
 #include "smb2pdu.h"