From 8a848efd482be65d488e888f96812d8729ea64ea Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 17 Dec 2025 15:03:25 +0000
Subject: [PATCH] cifs: SMB1 split: Adjust #includes

Adjust the #include set after the removal of the SMB1 protocol defs from
cifspdu.h.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.org>
cc: Enzo Matsumiya <ematsumiya@suse.de>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-kernel@vger.kernel.org
Acked-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/smb/client/cifs_unicode.c | 1 -
 fs/smb/client/cifsacl.c      | 1 -
 fs/smb/client/cifsencrypt.c  | 1 -
 fs/smb/client/cifsglob.h     | 2 --
 fs/smb/client/misc.c         | 1 +
 fs/smb/client/netmisc.c      | 1 +
 fs/smb/client/smb1proto.h    | 2 ++
 fs/smb/client/smb2file.c     | 1 -
 fs/smb/client/smb2inode.c    | 1 -
 fs/smb/client/smb2pdu.c      | 1 -
 fs/smb/client/smbencrypt.c   | 1 -
 fs/smb/client/transport.c    | 1 -
 fs/smb/client/xattr.c        | 1 -
 13 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/fs/smb/client/cifs_unicode.c b/fs/smb/client/cifs_unicode.c
index f8659d36793f1..e7891b4406f2e 100644
--- a/fs/smb/client/cifs_unicode.c
+++ b/fs/smb/client/cifs_unicode.c
@@ -8,7 +8,6 @@
 #include <linux/slab.h>
 #include "cifs_fs_sb.h"
 #include "cifs_unicode.h"
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifs_debug.h"
 
diff --git a/fs/smb/client/cifsacl.c b/fs/smb/client/cifsacl.c
index 7e6e473bd4a02..f03eda46f452c 100644
--- a/fs/smb/client/cifsacl.c
+++ b/fs/smb/client/cifsacl.c
@@ -17,7 +17,6 @@
 #include <linux/posix_acl.h>
 #include <linux/posix_acl_xattr.h>
 #include <keys/user-type.h>
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsacl.h"
 #include "cifsproto.h"
diff --git a/fs/smb/client/cifsencrypt.c b/fs/smb/client/cifsencrypt.c
index ca2a84e8673ee..661c7b8dc602c 100644
--- a/fs/smb/client/cifsencrypt.c
+++ b/fs/smb/client/cifsencrypt.c
@@ -11,7 +11,6 @@
 
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifs_debug.h"
 #include "cifs_unicode.h"
diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h
index a8ba44cda4ba1..c44013e671e3a 100644
--- a/fs/smb/client/cifsglob.h
+++ b/fs/smb/client/cifsglob.h
@@ -104,8 +104,6 @@
  */
 #define SMB2_MAX_CREDITS_AVAILABLE 32000
 
-#include "cifspdu.h"
-
 #ifndef XATTR_DOS_ATTRIB
 #define XATTR_DOS_ATTRIB "user.DOSATTRIB"
 #endif
diff --git a/fs/smb/client/misc.c b/fs/smb/client/misc.c
index b5bd555015713..dab2d594f024e 100644
--- a/fs/smb/client/misc.c
+++ b/fs/smb/client/misc.c
@@ -18,6 +18,7 @@
 #include "cifs_unicode.h"
 #include "smb2pdu.h"
 #include "smb2proto.h"
+#include "smb1proto.h"
 #include "cifsfs.h"
 #ifdef CONFIG_CIFS_DFS_UPCALL
 #include "dns_resolve.h"
diff --git a/fs/smb/client/netmisc.c b/fs/smb/client/netmisc.c
index 59a19f3854a89..1f8994a38b373 100644
--- a/fs/smb/client/netmisc.c
+++ b/fs/smb/client/netmisc.c
@@ -19,6 +19,7 @@
 #include "cifsfs.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
+#include "smb1proto.h"
 #include "smberr.h"
 #include "cifs_debug.h"
 #include "nterr.h"
diff --git a/fs/smb/client/smb1proto.h b/fs/smb/client/smb1proto.h
index 8de8b937294d7..b11d13bfd2d18 100644
--- a/fs/smb/client/smb1proto.h
+++ b/fs/smb/client/smb1proto.h
@@ -8,6 +8,8 @@
 #ifndef _SMB1PROTO_H
 #define _SMB1PROTO_H
 
+#include "cifspdu.h"
+
 struct cifs_unix_set_info_args {
 	__u64	ctime;
 	__u64	atime;
diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c
index 1cb77b04a2242..476c53b3711f4 100644
--- a/fs/smb/client/smb2file.c
+++ b/fs/smb/client/smb2file.c
@@ -13,7 +13,6 @@
 #include <linux/pagemap.h>
 #include <asm/div64.h>
 #include "cifsfs.h"
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c
index 8d697824c2d70..8a30088fed15b 100644
--- a/fs/smb/client/smb2inode.c
+++ b/fs/smb/client/smb2inode.c
@@ -13,7 +13,6 @@
 #include <linux/pagemap.h>
 #include <asm/div64.h>
 #include "cifsfs.h"
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c
index 83f5ce19f29ad..4602b4dfe8322 100644
--- a/fs/smb/client/smb2pdu.c
+++ b/fs/smb/client/smb2pdu.c
@@ -35,7 +35,6 @@
 #include "../common/smbfsctl.h"
 #include "../common/smb2status.h"
 #include "smb2glob.h"
-#include "cifspdu.h"
 #include "cifs_spnego.h"
 #include "../common/smbdirect/smbdirect.h"
 #include "smbdirect.h"
diff --git a/fs/smb/client/smbencrypt.c b/fs/smb/client/smbencrypt.c
index 1d1ee9f18f373..094b8296d9b41 100644
--- a/fs/smb/client/smbencrypt.c
+++ b/fs/smb/client/smbencrypt.c
@@ -20,7 +20,6 @@
 #include <linux/random.h>
 #include "cifs_fs_sb.h"
 #include "cifs_unicode.h"
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifs_debug.h"
 #include "cifsproto.h"
diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c
index 3b34c3f4da2df..75697f6d2566e 100644
--- a/fs/smb/client/transport.c
+++ b/fs/smb/client/transport.c
@@ -23,7 +23,6 @@
 #include <linux/sched/signal.h>
 #include <linux/task_io_accounting_ops.h>
 #include <linux/task_work.h>
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
diff --git a/fs/smb/client/xattr.c b/fs/smb/client/xattr.c
index 6bc89c59164ad..e1a7d9a10a536 100644
--- a/fs/smb/client/xattr.c
+++ b/fs/smb/client/xattr.c
@@ -11,7 +11,6 @@
 #include <linux/slab.h>
 #include <linux/xattr.h>
 #include "cifsfs.h"
-#include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
-- 
2.47.3