[PATCH v4 01/24] smb: rename common/cifsglob.h to common/smbglob.h

chenxiaosong.chenxiaosong
2025-10-27T07:15:24Z

From: ZhangGuoDong <zhangguodong@kylinos.cn>

"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>
---
fs/smb/client/cifsglob.h | 2 +-
fs/smb/common/{cifsglob.h => smbglob.h} | 6 +++---
fs/smb/server/smb_common.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename fs/smb/common/{cifsglob.h => smbglob.h} (89%)

diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index 203e2aaa3c25..8fd9aa7e2009 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 00fd215e3eb5..c51d227977c4 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 863716207a0d..910b9c3bd244 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"

--
2.43.0