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>

diff --git a/fs/smb/client/cifs_unicode.c b/fs/smb/client/cifs_unicode.c
index f8659d36793f17d4eaf6198eacfa37abd0bcfeca..e7891b4406f2e27f2d19fe7aab03549cc254258b 100644 (file)
--- 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 7e6e473bd4a029d3b2efa9ad2ff7978353a36e83..f03eda46f452c7d2edf053560c48fb4e5289f438 100644 (file)
--- 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 ca2a84e8673ee573eb324f50156874b880abdff0..661c7b8dc602c8eb8f0b4d76166b52d0a69079df 100644 (file)
--- 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 a8ba44cda4ba1f9ee53f10ac635ac3b97787c183..c44013e671e3a7c1fa9639016e96943eb985cf9a 100644 (file)
--- 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 b5bd555015713fd5eed549cb4d3b15b51299e786..dab2d594f024ef6aecf5c4d5e835e278bba0cf6f 100644 (file)
--- 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 59a19f3854a89c8622635d5706dc594e687716e1..1f8994a38b373fd96d0e994e870f3047a1ca873a 100644 (file)
--- 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 8de8b937294d7461f6efabf09b632e80b6ba8baa..b11d13bfd2d184d8f45a94e613ac14c04a2f4a03 100644 (file)
--- 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 1cb77b04a224202d29e9d3ca24e3837008d240ce..476c53b3711f4e80dd19b5781b32ce340d2a578d 100644 (file)
--- 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 8d697824c2d70dd4bf1d4eb5c684ec8812acb5cb..8a30088fed15b5891e3ecacaaf10e4ce10bafc62 100644 (file)
--- 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 83f5ce19f29adf65d4a829416117cbffe9d90617..4602b4dfe8322e65aa36dfc8f7e05e3d5ff4027d 100644 (file)
--- 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 1d1ee9f18f373501f781447f82b494857dd8e9f3..094b8296d9b41b7928918e3b70a2f262a8ff114c 100644 (file)
--- 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 3b34c3f4da2df786d2c3f170a3648ac324eed213..75697f6d2566e91c80397a295eaa53bf6c724ed7 100644 (file)
--- 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 6bc89c59164ad0c70e128569850d7198357d3147..e1a7d9a10a53641a04e9476a423fca1bc3c00162 100644 (file)
--- 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"