summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhangGuoDong <zhangguodong@kylinos.cn>2025-10-27 15:12:53 +0800
committerSteve French <stfrench@microsoft.com>2025-11-30 21:11:43 -0600
commit94b955167e3b11372e314f45f4b2fbf4f92493b9 (patch)
treebbb6c25a5aacbec9a55125d84cdae214ac7f832d
parent7d9f51d36b6c24e02b8a379cbaf1a273511ed403 (diff)
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>
-rw-r--r--fs/smb/client/cifsglob.h2
-rw-r--r--fs/smb/common/smbglob.h (renamed from fs/smb/common/cifsglob.h)6
-rw-r--r--fs/smb/server/smb_common.h2
3 files changed, 5 insertions, 5 deletions
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
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 9fa1da647d90..560308e0d042 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"