MAINTAINERS | 8 ++++---- fs/Kconfig | 10 +--------- fs/Makefile | 4 +--- fs/smbfs/Kconfig | 12 ++++++++++++ fs/smbfs/Makefile | 5 +++++ fs/{cifs => smbfs/client}/Kconfig | 0 fs/{cifs => smbfs/client}/Makefile | 0 fs/{cifs => smbfs/client}/asn1.c | 0 fs/{cifs => smbfs/client}/cached_dir.c | 0 fs/{cifs => smbfs/client}/cached_dir.h | 0 fs/{cifs => smbfs/client}/cifs_debug.c | 0 fs/{cifs => smbfs/client}/cifs_debug.h | 0 fs/{cifs => smbfs/client}/cifs_dfs_ref.c | 0 fs/{cifs => smbfs/client}/cifs_fs_sb.h | 0 fs/{cifs => smbfs/client}/cifs_ioctl.h | 0 fs/{cifs => smbfs/client}/cifs_spnego.c | 0 fs/{cifs => smbfs/client}/cifs_spnego.h | 0 fs/{cifs => smbfs/client}/cifs_spnego_negtokeninit.asn1 | 0 fs/{cifs => smbfs/client}/cifs_swn.c | 0 fs/{cifs => smbfs/client}/cifs_swn.h | 0 fs/{cifs => smbfs/client}/cifs_unicode.c | 0 fs/{cifs => smbfs/client}/cifs_unicode.h | 0 fs/{cifs => smbfs/client}/cifs_uniupr.h | 0 fs/{cifs => smbfs/client}/cifsacl.c | 0 fs/{cifs => smbfs/client}/cifsacl.h | 0 fs/{cifs => smbfs/client}/cifsencrypt.c | 2 +- fs/{cifs => smbfs/client}/cifsfs.c | 0 fs/{cifs => smbfs/client}/cifsfs.h | 0 fs/{cifs => smbfs/client}/cifsglob.h | 2 +- fs/{cifs => smbfs/client}/cifspdu.h | 2 +- fs/{cifs => smbfs/client}/cifsproto.h | 0 fs/{cifs => smbfs/client}/cifsroot.c | 0 fs/{cifs => smbfs/client}/cifssmb.c | 0 fs/{cifs => smbfs/client}/connect.c | 0 fs/{cifs => smbfs/client}/dfs.c | 0 fs/{cifs => smbfs/client}/dfs.h | 0 fs/{cifs => smbfs/client}/dfs_cache.c | 0 fs/{cifs => smbfs/client}/dfs_cache.h | 0 fs/{cifs => smbfs/client}/dir.c | 0 fs/{cifs => smbfs/client}/dns_resolve.c | 0 fs/{cifs => smbfs/client}/dns_resolve.h | 0 fs/{cifs => smbfs/client}/export.c | 0 fs/{cifs => smbfs/client}/file.c | 0 fs/{cifs => smbfs/client}/fs_context.c | 0 fs/{cifs => smbfs/client}/fs_context.h | 0 fs/{cifs => smbfs/client}/fscache.c | 0 fs/{cifs => smbfs/client}/fscache.h | 0 fs/{cifs => smbfs/client}/inode.c | 0 fs/{cifs => smbfs/client}/ioctl.c | 0 fs/{cifs => smbfs/client}/link.c | 0 fs/{cifs => smbfs/client}/misc.c | 0 fs/{cifs => smbfs/client}/netlink.c | 0 fs/{cifs => smbfs/client}/netlink.h | 0 fs/{cifs => smbfs/client}/netmisc.c | 0 fs/{cifs => smbfs/client}/nterr.c | 0 fs/{cifs => smbfs/client}/nterr.h | 0 fs/{cifs => smbfs/client}/ntlmssp.h | 0 fs/{cifs => smbfs/client}/readdir.c | 0 fs/{cifs => smbfs/client}/rfc1002pdu.h | 0 fs/{cifs => smbfs/client}/sess.c | 0 fs/{cifs => smbfs/client}/smb1ops.c | 0 fs/{cifs => smbfs/client}/smb2file.c | 0 fs/{cifs => smbfs/client}/smb2glob.h | 0 fs/{cifs => smbfs/client}/smb2inode.c | 0 fs/{cifs => smbfs/client}/smb2maperror.c | 0 fs/{cifs => smbfs/client}/smb2misc.c | 0 fs/{cifs => smbfs/client}/smb2ops.c | 0 fs/{cifs => smbfs/client}/smb2pdu.c | 0 fs/{cifs => smbfs/client}/smb2pdu.h | 0 fs/{cifs => smbfs/client}/smb2proto.h | 0 fs/{cifs => smbfs/client}/smb2status.h | 0 fs/{cifs => smbfs/client}/smb2transport.c | 0 fs/{cifs => smbfs/client}/smbdirect.c | 0 fs/{cifs => smbfs/client}/smbdirect.h | 0 fs/{cifs => smbfs/client}/smbencrypt.c | 2 +- fs/{cifs => smbfs/client}/smberr.h | 0 fs/{cifs => smbfs/client}/trace.c | 0 fs/{cifs => smbfs/client}/trace.h | 0 fs/{cifs => smbfs/client}/transport.c | 0 fs/{cifs => smbfs/client}/unc.c | 0 fs/{cifs => smbfs/client}/winucase.c | 0 fs/{cifs => smbfs/client}/xattr.c | 0 fs/{smbfs_common => smbfs/common}/Makefile | 4 ++-- fs/{smbfs_common => smbfs/common}/arc4.h | 0 fs/{smbfs_common => smbfs/common}/cifs_arc4.c | 0 fs/{smbfs_common => smbfs/common}/cifs_md4.c | 0 fs/{smbfs_common => smbfs/common}/md4.h | 0 fs/{smbfs_common => smbfs/common}/smb2pdu.h | 0 fs/{smbfs_common => smbfs/common}/smbfsctl.h | 0 fs/{ksmbd => smbfs/server}/Kconfig | 0 fs/{ksmbd => smbfs/server}/Makefile | 0 fs/{ksmbd => smbfs/server}/asn1.c | 0 fs/{ksmbd => smbfs/server}/asn1.h | 0 fs/{ksmbd => smbfs/server}/auth.c | 2 +- fs/{ksmbd => smbfs/server}/auth.h | 0 fs/{ksmbd => smbfs/server}/connection.c | 0 fs/{ksmbd => smbfs/server}/connection.h | 0 fs/{ksmbd => smbfs/server}/crypto_ctx.c | 0 fs/{ksmbd => smbfs/server}/crypto_ctx.h | 0 fs/{ksmbd => smbfs/server}/glob.h | 0 fs/{ksmbd => smbfs/server}/ksmbd_netlink.h | 0 fs/{ksmbd => smbfs/server}/ksmbd_spnego_negtokeninit.asn1 | 0 fs/{ksmbd => smbfs/server}/ksmbd_spnego_negtokentarg.asn1 | 0 fs/{ksmbd => smbfs/server}/ksmbd_work.c | 0 fs/{ksmbd => smbfs/server}/ksmbd_work.h | 0 fs/{ksmbd => smbfs/server}/mgmt/ksmbd_ida.c | 0 fs/{ksmbd => smbfs/server}/mgmt/ksmbd_ida.h | 0 fs/{ksmbd => smbfs/server}/mgmt/share_config.c | 0 fs/{ksmbd => smbfs/server}/mgmt/share_config.h | 0 fs/{ksmbd => smbfs/server}/mgmt/tree_connect.c | 0 fs/{ksmbd => smbfs/server}/mgmt/tree_connect.h | 0 fs/{ksmbd => smbfs/server}/mgmt/user_config.c | 0 fs/{ksmbd => smbfs/server}/mgmt/user_config.h | 0 fs/{ksmbd => smbfs/server}/mgmt/user_session.c | 0 fs/{ksmbd => smbfs/server}/mgmt/user_session.h | 0 fs/{ksmbd => smbfs/server}/misc.c | 0 fs/{ksmbd => smbfs/server}/misc.h | 0 fs/{ksmbd => smbfs/server}/ndr.c | 0 fs/{ksmbd => smbfs/server}/ndr.h | 0 fs/{ksmbd => smbfs/server}/nterr.h | 0 fs/{ksmbd => smbfs/server}/ntlmssp.h | 0 fs/{ksmbd => smbfs/server}/oplock.c | 0 fs/{ksmbd => smbfs/server}/oplock.h | 0 fs/{ksmbd => smbfs/server}/server.c | 0 fs/{ksmbd => smbfs/server}/server.h | 0 fs/{ksmbd => smbfs/server}/smb2misc.c | 0 fs/{ksmbd => smbfs/server}/smb2ops.c | 0 fs/{ksmbd => smbfs/server}/smb2pdu.c | 0 fs/{ksmbd => smbfs/server}/smb2pdu.h | 0 fs/{ksmbd => smbfs/server}/smb_common.c | 0 fs/{ksmbd => smbfs/server}/smb_common.h | 2 +- fs/{ksmbd => smbfs/server}/smbacl.c | 0 fs/{ksmbd => smbfs/server}/smbacl.h | 0 fs/{ksmbd => smbfs/server}/smbfsctl.h | 0 fs/{ksmbd => smbfs/server}/smbstatus.h | 0 fs/{ksmbd => smbfs/server}/transport_ipc.c | 0 fs/{ksmbd => smbfs/server}/transport_ipc.h | 0 fs/{ksmbd => smbfs/server}/transport_rdma.c | 0 fs/{ksmbd => smbfs/server}/transport_rdma.h | 0 fs/{ksmbd => smbfs/server}/transport_tcp.c | 0 fs/{ksmbd => smbfs/server}/transport_tcp.h | 0 fs/{ksmbd => smbfs/server}/unicode.c | 0 fs/{ksmbd => smbfs/server}/unicode.h | 0 fs/{ksmbd => smbfs/server}/uniupr.h | 0 fs/{ksmbd => smbfs/server}/vfs.c | 0 fs/{ksmbd => smbfs/server}/vfs.h | 0 fs/{ksmbd => smbfs/server}/vfs_cache.c | 0 fs/{ksmbd => smbfs/server}/vfs_cache.h | 0 fs/{ksmbd => smbfs/server}/xattr.h | 0 149 files changed, 31 insertions(+), 24 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 27ef11624748..6eef3f1787c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5140,8 +5140,8 @@ S: Supported W: https://wiki.samba.org/index.php/LinuxCIFS T: git git://git.samba.org/sfrench/cifs-2.6.git F: Documentation/admin-guide/cifs/ -F: fs/cifs/ -F: fs/smbfs_common/ +F: fs/smbfs/client/ +F: fs/smbfs/common/ F: include/uapi/linux/cifs COMPACTPCI HOTPLUG CORE @@ -11301,8 +11301,8 @@ L: linux-cifs@vger.kernel.org S: Maintained T: git git://git.samba.org/ksmbd.git F: Documentation/filesystems/cifs/ksmbd.rst -F: fs/ksmbd/ -F: fs/smbfs_common/ +F: fs/smbfs/common/ +F: fs/smbfs/server/ KERNEL UNIT TESTING FRAMEWORK (KUnit) M: Brendan Higgins diff --git a/fs/Kconfig b/fs/Kconfig index cc07a0cd3172..9f4d4df943be 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -367,15 +367,7 @@ config NFS_V4_2_SSC_HELPER source "net/sunrpc/Kconfig" source "fs/ceph/Kconfig" - -source "fs/cifs/Kconfig" -source "fs/ksmbd/Kconfig" - -config SMBFS_COMMON - tristate - default y if CIFS=y || SMB_SERVER=y - default m if CIFS=m || SMB_SERVER=m - +source "fs/smbfs/Kconfig" source "fs/coda/Kconfig" source "fs/afs/Kconfig" source "fs/9p/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index 834f1c3dba46..1fa48aab2602 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -95,9 +95,7 @@ obj-$(CONFIG_LOCKD) += lockd/ obj-$(CONFIG_NLS) += nls/ obj-y += unicode/ obj-$(CONFIG_SYSV_FS) += sysv/ -obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ -obj-$(CONFIG_CIFS) += cifs/ -obj-$(CONFIG_SMB_SERVER) += ksmbd/ +obj-$(CONFIG_SMBFS) += smbfs/ obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_NTFS_FS) += ntfs/ obj-$(CONFIG_NTFS3_FS) += ntfs3/ diff --git a/fs/smbfs/Kconfig b/fs/smbfs/Kconfig new file mode 100644 index 000000000000..18ccf9c4be08 --- /dev/null +++ b/fs/smbfs/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# smbfs configuration + +source "fs/smbfs/client/Kconfig" +source "fs/smbfs/server/Kconfig" + +config SMBFS + tristate + default y if CIFS=y || SMB_SERVER=y + default m if CIFS=m || SMB_SERVER=m + diff --git a/fs/smbfs/Makefile b/fs/smbfs/Makefile new file mode 100644 index 000000000000..9a1bf59a1a65 --- /dev/null +++ b/fs/smbfs/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_SMBFS) += common/ +obj-$(CONFIG_CIFS) += client/ +obj-$(CONFIG_SMB_SERVER) += server/ diff --git a/fs/cifs/Kconfig b/fs/smbfs/client/Kconfig similarity index 100% rename from fs/cifs/Kconfig rename to fs/smbfs/client/Kconfig diff --git a/fs/cifs/Makefile b/fs/smbfs/client/Makefile similarity index 100% rename from fs/cifs/Makefile rename to fs/smbfs/client/Makefile diff --git a/fs/cifs/asn1.c b/fs/smbfs/client/asn1.c similarity index 100% rename from fs/cifs/asn1.c rename to fs/smbfs/client/asn1.c diff --git a/fs/cifs/cached_dir.c b/fs/smbfs/client/cached_dir.c similarity index 100% rename from fs/cifs/cached_dir.c rename to fs/smbfs/client/cached_dir.c diff --git a/fs/cifs/cached_dir.h b/fs/smbfs/client/cached_dir.h similarity index 100% rename from fs/cifs/cached_dir.h rename to fs/smbfs/client/cached_dir.h diff --git a/fs/cifs/cifs_debug.c b/fs/smbfs/client/cifs_debug.c similarity index 100% rename from fs/cifs/cifs_debug.c rename to fs/smbfs/client/cifs_debug.c diff --git a/fs/cifs/cifs_debug.h b/fs/smbfs/client/cifs_debug.h similarity index 100% rename from fs/cifs/cifs_debug.h rename to fs/smbfs/client/cifs_debug.h diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smbfs/client/cifs_dfs_ref.c similarity index 100% rename from fs/cifs/cifs_dfs_ref.c rename to fs/smbfs/client/cifs_dfs_ref.c diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smbfs/client/cifs_fs_sb.h similarity index 100% rename from fs/cifs/cifs_fs_sb.h rename to fs/smbfs/client/cifs_fs_sb.h diff --git a/fs/cifs/cifs_ioctl.h b/fs/smbfs/client/cifs_ioctl.h similarity index 100% rename from fs/cifs/cifs_ioctl.h rename to fs/smbfs/client/cifs_ioctl.h diff --git a/fs/cifs/cifs_spnego.c b/fs/smbfs/client/cifs_spnego.c similarity index 100% rename from fs/cifs/cifs_spnego.c rename to fs/smbfs/client/cifs_spnego.c diff --git a/fs/cifs/cifs_spnego.h b/fs/smbfs/client/cifs_spnego.h similarity index 100% rename from fs/cifs/cifs_spnego.h rename to fs/smbfs/client/cifs_spnego.h diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smbfs/client/cifs_spnego_negtokeninit.asn1 similarity index 100% rename from fs/cifs/cifs_spnego_negtokeninit.asn1 rename to fs/smbfs/client/cifs_spnego_negtokeninit.asn1 diff --git a/fs/cifs/cifs_swn.c b/fs/smbfs/client/cifs_swn.c similarity index 100% rename from fs/cifs/cifs_swn.c rename to fs/smbfs/client/cifs_swn.c diff --git a/fs/cifs/cifs_swn.h b/fs/smbfs/client/cifs_swn.h similarity index 100% rename from fs/cifs/cifs_swn.h rename to fs/smbfs/client/cifs_swn.h diff --git a/fs/cifs/cifs_unicode.c b/fs/smbfs/client/cifs_unicode.c similarity index 100% rename from fs/cifs/cifs_unicode.c rename to fs/smbfs/client/cifs_unicode.c diff --git a/fs/cifs/cifs_unicode.h b/fs/smbfs/client/cifs_unicode.h similarity index 100% rename from fs/cifs/cifs_unicode.h rename to fs/smbfs/client/cifs_unicode.h diff --git a/fs/cifs/cifs_uniupr.h b/fs/smbfs/client/cifs_uniupr.h similarity index 100% rename from fs/cifs/cifs_uniupr.h rename to fs/smbfs/client/cifs_uniupr.h diff --git a/fs/cifs/cifsacl.c b/fs/smbfs/client/cifsacl.c similarity index 100% rename from fs/cifs/cifsacl.c rename to fs/smbfs/client/cifsacl.c diff --git a/fs/cifs/cifsacl.h b/fs/smbfs/client/cifsacl.h similarity index 100% rename from fs/cifs/cifsacl.h rename to fs/smbfs/client/cifsacl.h diff --git a/fs/cifs/cifsencrypt.c b/fs/smbfs/client/cifsencrypt.c similarity index 99% rename from fs/cifs/cifsencrypt.c rename to fs/smbfs/client/cifsencrypt.c index 357bd27a7fd1..ef4c2e3c9fa6 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/smbfs/client/cifsencrypt.c @@ -21,7 +21,7 @@ #include #include #include -#include "../smbfs_common/arc4.h" +#include "../common/arc4.h" #include /* diff --git a/fs/cifs/cifsfs.c b/fs/smbfs/client/cifsfs.c similarity index 100% rename from fs/cifs/cifsfs.c rename to fs/smbfs/client/cifsfs.c diff --git a/fs/cifs/cifsfs.h b/fs/smbfs/client/cifsfs.h similarity index 100% rename from fs/cifs/cifsfs.h rename to fs/smbfs/client/cifsfs.h diff --git a/fs/cifs/cifsglob.h b/fs/smbfs/client/cifsglob.h similarity index 99% rename from fs/cifs/cifsglob.h rename to fs/smbfs/client/cifsglob.h index 5f8fd20951af..0d84bb1a8cd9 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/smbfs/client/cifsglob.h @@ -24,7 +24,7 @@ #include "cifsacl.h" #include #include -#include "../smbfs_common/smb2pdu.h" +#include "../common/smb2pdu.h" #include "smb2pdu.h" #include diff --git a/fs/cifs/cifspdu.h b/fs/smbfs/client/cifspdu.h similarity index 99% rename from fs/cifs/cifspdu.h rename to fs/smbfs/client/cifspdu.h index 445e3eaebcc1..e17222fec9d2 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/smbfs/client/cifspdu.h @@ -11,7 +11,7 @@ #include #include -#include "../smbfs_common/smbfsctl.h" +#include "../common/smbfsctl.h" #define CIFS_PROT 0 #define POSIX_PROT (CIFS_PROT+1) diff --git a/fs/cifs/cifsproto.h b/fs/smbfs/client/cifsproto.h similarity index 100% rename from fs/cifs/cifsproto.h rename to fs/smbfs/client/cifsproto.h diff --git a/fs/cifs/cifsroot.c b/fs/smbfs/client/cifsroot.c similarity index 100% rename from fs/cifs/cifsroot.c rename to fs/smbfs/client/cifsroot.c diff --git a/fs/cifs/cifssmb.c b/fs/smbfs/client/cifssmb.c similarity index 100% rename from fs/cifs/cifssmb.c rename to fs/smbfs/client/cifssmb.c diff --git a/fs/cifs/connect.c b/fs/smbfs/client/connect.c similarity index 100% rename from fs/cifs/connect.c rename to fs/smbfs/client/connect.c diff --git a/fs/cifs/dfs.c b/fs/smbfs/client/dfs.c similarity index 100% rename from fs/cifs/dfs.c rename to fs/smbfs/client/dfs.c diff --git a/fs/cifs/dfs.h b/fs/smbfs/client/dfs.h similarity index 100% rename from fs/cifs/dfs.h rename to fs/smbfs/client/dfs.h diff --git a/fs/cifs/dfs_cache.c b/fs/smbfs/client/dfs_cache.c similarity index 100% rename from fs/cifs/dfs_cache.c rename to fs/smbfs/client/dfs_cache.c diff --git a/fs/cifs/dfs_cache.h b/fs/smbfs/client/dfs_cache.h similarity index 100% rename from fs/cifs/dfs_cache.h rename to fs/smbfs/client/dfs_cache.h diff --git a/fs/cifs/dir.c b/fs/smbfs/client/dir.c similarity index 100% rename from fs/cifs/dir.c rename to fs/smbfs/client/dir.c diff --git a/fs/cifs/dns_resolve.c b/fs/smbfs/client/dns_resolve.c similarity index 100% rename from fs/cifs/dns_resolve.c rename to fs/smbfs/client/dns_resolve.c diff --git a/fs/cifs/dns_resolve.h b/fs/smbfs/client/dns_resolve.h similarity index 100% rename from fs/cifs/dns_resolve.h rename to fs/smbfs/client/dns_resolve.h diff --git a/fs/cifs/export.c b/fs/smbfs/client/export.c similarity index 100% rename from fs/cifs/export.c rename to fs/smbfs/client/export.c diff --git a/fs/cifs/file.c b/fs/smbfs/client/file.c similarity index 100% rename from fs/cifs/file.c rename to fs/smbfs/client/file.c diff --git a/fs/cifs/fs_context.c b/fs/smbfs/client/fs_context.c similarity index 100% rename from fs/cifs/fs_context.c rename to fs/smbfs/client/fs_context.c diff --git a/fs/cifs/fs_context.h b/fs/smbfs/client/fs_context.h similarity index 100% rename from fs/cifs/fs_context.h rename to fs/smbfs/client/fs_context.h diff --git a/fs/cifs/fscache.c b/fs/smbfs/client/fscache.c similarity index 100% rename from fs/cifs/fscache.c rename to fs/smbfs/client/fscache.c diff --git a/fs/cifs/fscache.h b/fs/smbfs/client/fscache.h similarity index 100% rename from fs/cifs/fscache.h rename to fs/smbfs/client/fscache.h diff --git a/fs/cifs/inode.c b/fs/smbfs/client/inode.c similarity index 100% rename from fs/cifs/inode.c rename to fs/smbfs/client/inode.c diff --git a/fs/cifs/ioctl.c b/fs/smbfs/client/ioctl.c similarity index 100% rename from fs/cifs/ioctl.c rename to fs/smbfs/client/ioctl.c diff --git a/fs/cifs/link.c b/fs/smbfs/client/link.c similarity index 100% rename from fs/cifs/link.c rename to fs/smbfs/client/link.c diff --git a/fs/cifs/misc.c b/fs/smbfs/client/misc.c similarity index 100% rename from fs/cifs/misc.c rename to fs/smbfs/client/misc.c diff --git a/fs/cifs/netlink.c b/fs/smbfs/client/netlink.c similarity index 100% rename from fs/cifs/netlink.c rename to fs/smbfs/client/netlink.c diff --git a/fs/cifs/netlink.h b/fs/smbfs/client/netlink.h similarity index 100% rename from fs/cifs/netlink.h rename to fs/smbfs/client/netlink.h diff --git a/fs/cifs/netmisc.c b/fs/smbfs/client/netmisc.c similarity index 100% rename from fs/cifs/netmisc.c rename to fs/smbfs/client/netmisc.c diff --git a/fs/cifs/nterr.c b/fs/smbfs/client/nterr.c similarity index 100% rename from fs/cifs/nterr.c rename to fs/smbfs/client/nterr.c diff --git a/fs/cifs/nterr.h b/fs/smbfs/client/nterr.h similarity index 100% rename from fs/cifs/nterr.h rename to fs/smbfs/client/nterr.h diff --git a/fs/cifs/ntlmssp.h b/fs/smbfs/client/ntlmssp.h similarity index 100% rename from fs/cifs/ntlmssp.h rename to fs/smbfs/client/ntlmssp.h diff --git a/fs/cifs/readdir.c b/fs/smbfs/client/readdir.c similarity index 100% rename from fs/cifs/readdir.c rename to fs/smbfs/client/readdir.c diff --git a/fs/cifs/rfc1002pdu.h b/fs/smbfs/client/rfc1002pdu.h similarity index 100% rename from fs/cifs/rfc1002pdu.h rename to fs/smbfs/client/rfc1002pdu.h diff --git a/fs/cifs/sess.c b/fs/smbfs/client/sess.c similarity index 100% rename from fs/cifs/sess.c rename to fs/smbfs/client/sess.c diff --git a/fs/cifs/smb1ops.c b/fs/smbfs/client/smb1ops.c similarity index 100% rename from fs/cifs/smb1ops.c rename to fs/smbfs/client/smb1ops.c diff --git a/fs/cifs/smb2file.c b/fs/smbfs/client/smb2file.c similarity index 100% rename from fs/cifs/smb2file.c rename to fs/smbfs/client/smb2file.c diff --git a/fs/cifs/smb2glob.h b/fs/smbfs/client/smb2glob.h similarity index 100% rename from fs/cifs/smb2glob.h rename to fs/smbfs/client/smb2glob.h diff --git a/fs/cifs/smb2inode.c b/fs/smbfs/client/smb2inode.c similarity index 100% rename from fs/cifs/smb2inode.c rename to fs/smbfs/client/smb2inode.c diff --git a/fs/cifs/smb2maperror.c b/fs/smbfs/client/smb2maperror.c similarity index 100% rename from fs/cifs/smb2maperror.c rename to fs/smbfs/client/smb2maperror.c diff --git a/fs/cifs/smb2misc.c b/fs/smbfs/client/smb2misc.c similarity index 100% rename from fs/cifs/smb2misc.c rename to fs/smbfs/client/smb2misc.c diff --git a/fs/cifs/smb2ops.c b/fs/smbfs/client/smb2ops.c similarity index 100% rename from fs/cifs/smb2ops.c rename to fs/smbfs/client/smb2ops.c diff --git a/fs/cifs/smb2pdu.c b/fs/smbfs/client/smb2pdu.c similarity index 100% rename from fs/cifs/smb2pdu.c rename to fs/smbfs/client/smb2pdu.c diff --git a/fs/cifs/smb2pdu.h b/fs/smbfs/client/smb2pdu.h similarity index 100% rename from fs/cifs/smb2pdu.h rename to fs/smbfs/client/smb2pdu.h diff --git a/fs/cifs/smb2proto.h b/fs/smbfs/client/smb2proto.h similarity index 100% rename from fs/cifs/smb2proto.h rename to fs/smbfs/client/smb2proto.h diff --git a/fs/cifs/smb2status.h b/fs/smbfs/client/smb2status.h similarity index 100% rename from fs/cifs/smb2status.h rename to fs/smbfs/client/smb2status.h diff --git a/fs/cifs/smb2transport.c b/fs/smbfs/client/smb2transport.c similarity index 100% rename from fs/cifs/smb2transport.c rename to fs/smbfs/client/smb2transport.c diff --git a/fs/cifs/smbdirect.c b/fs/smbfs/client/smbdirect.c similarity index 100% rename from fs/cifs/smbdirect.c rename to fs/smbfs/client/smbdirect.c diff --git a/fs/cifs/smbdirect.h b/fs/smbfs/client/smbdirect.h similarity index 100% rename from fs/cifs/smbdirect.h rename to fs/smbfs/client/smbdirect.h diff --git a/fs/cifs/smbencrypt.c b/fs/smbfs/client/smbencrypt.c similarity index 98% rename from fs/cifs/smbencrypt.c rename to fs/smbfs/client/smbencrypt.c index 4a0487753869..f0ce26414f17 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/smbfs/client/smbencrypt.c @@ -24,7 +24,7 @@ #include "cifsglob.h" #include "cifs_debug.h" #include "cifsproto.h" -#include "../smbfs_common/md4.h" +#include "../common/md4.h" #ifndef false #define false 0 diff --git a/fs/cifs/smberr.h b/fs/smbfs/client/smberr.h similarity index 100% rename from fs/cifs/smberr.h rename to fs/smbfs/client/smberr.h diff --git a/fs/cifs/trace.c b/fs/smbfs/client/trace.c similarity index 100% rename from fs/cifs/trace.c rename to fs/smbfs/client/trace.c diff --git a/fs/cifs/trace.h b/fs/smbfs/client/trace.h similarity index 100% rename from fs/cifs/trace.h rename to fs/smbfs/client/trace.h diff --git a/fs/cifs/transport.c b/fs/smbfs/client/transport.c similarity index 100% rename from fs/cifs/transport.c rename to fs/smbfs/client/transport.c diff --git a/fs/cifs/unc.c b/fs/smbfs/client/unc.c similarity index 100% rename from fs/cifs/unc.c rename to fs/smbfs/client/unc.c diff --git a/fs/cifs/winucase.c b/fs/smbfs/client/winucase.c similarity index 100% rename from fs/cifs/winucase.c rename to fs/smbfs/client/winucase.c diff --git a/fs/cifs/xattr.c b/fs/smbfs/client/xattr.c similarity index 100% rename from fs/cifs/xattr.c rename to fs/smbfs/client/xattr.c diff --git a/fs/smbfs_common/Makefile b/fs/smbfs/common/Makefile similarity index 59% rename from fs/smbfs_common/Makefile rename to fs/smbfs/common/Makefile index cafc61a3bfc3..c66dbbc1469c 100644 --- a/fs/smbfs_common/Makefile +++ b/fs/smbfs/common/Makefile @@ -3,5 +3,5 @@ # Makefile for Linux filesystem routines that are shared by client and server. # -obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o -obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o +obj-$(CONFIG_SMBFS) += cifs_arc4.o +obj-$(CONFIG_SMBFS) += cifs_md4.o diff --git a/fs/smbfs_common/arc4.h b/fs/smbfs/common/arc4.h similarity index 100% rename from fs/smbfs_common/arc4.h rename to fs/smbfs/common/arc4.h diff --git a/fs/smbfs_common/cifs_arc4.c b/fs/smbfs/common/cifs_arc4.c similarity index 100% rename from fs/smbfs_common/cifs_arc4.c rename to fs/smbfs/common/cifs_arc4.c diff --git a/fs/smbfs_common/cifs_md4.c b/fs/smbfs/common/cifs_md4.c similarity index 100% rename from fs/smbfs_common/cifs_md4.c rename to fs/smbfs/common/cifs_md4.c diff --git a/fs/smbfs_common/md4.h b/fs/smbfs/common/md4.h similarity index 100% rename from fs/smbfs_common/md4.h rename to fs/smbfs/common/md4.h diff --git a/fs/smbfs_common/smb2pdu.h b/fs/smbfs/common/smb2pdu.h similarity index 100% rename from fs/smbfs_common/smb2pdu.h rename to fs/smbfs/common/smb2pdu.h diff --git a/fs/smbfs_common/smbfsctl.h b/fs/smbfs/common/smbfsctl.h similarity index 100% rename from fs/smbfs_common/smbfsctl.h rename to fs/smbfs/common/smbfsctl.h diff --git a/fs/ksmbd/Kconfig b/fs/smbfs/server/Kconfig similarity index 100% rename from fs/ksmbd/Kconfig rename to fs/smbfs/server/Kconfig diff --git a/fs/ksmbd/Makefile b/fs/smbfs/server/Makefile similarity index 100% rename from fs/ksmbd/Makefile rename to fs/smbfs/server/Makefile diff --git a/fs/ksmbd/asn1.c b/fs/smbfs/server/asn1.c similarity index 100% rename from fs/ksmbd/asn1.c rename to fs/smbfs/server/asn1.c diff --git a/fs/ksmbd/asn1.h b/fs/smbfs/server/asn1.h similarity index 100% rename from fs/ksmbd/asn1.h rename to fs/smbfs/server/asn1.h diff --git a/fs/ksmbd/auth.c b/fs/smbfs/server/auth.c similarity index 99% rename from fs/ksmbd/auth.c rename to fs/smbfs/server/auth.c index df8fb076f6f1..5e5e120edcc2 100644 --- a/fs/ksmbd/auth.c +++ b/fs/smbfs/server/auth.c @@ -29,7 +29,7 @@ #include "mgmt/user_config.h" #include "crypto_ctx.h" #include "transport_ipc.h" -#include "../smbfs_common/arc4.h" +#include "../common/arc4.h" /* * Fixed format data defining GSS header and fixed string diff --git a/fs/ksmbd/auth.h b/fs/smbfs/server/auth.h similarity index 100% rename from fs/ksmbd/auth.h rename to fs/smbfs/server/auth.h diff --git a/fs/ksmbd/connection.c b/fs/smbfs/server/connection.c similarity index 100% rename from fs/ksmbd/connection.c rename to fs/smbfs/server/connection.c diff --git a/fs/ksmbd/connection.h b/fs/smbfs/server/connection.h similarity index 100% rename from fs/ksmbd/connection.h rename to fs/smbfs/server/connection.h diff --git a/fs/ksmbd/crypto_ctx.c b/fs/smbfs/server/crypto_ctx.c similarity index 100% rename from fs/ksmbd/crypto_ctx.c rename to fs/smbfs/server/crypto_ctx.c diff --git a/fs/ksmbd/crypto_ctx.h b/fs/smbfs/server/crypto_ctx.h similarity index 100% rename from fs/ksmbd/crypto_ctx.h rename to fs/smbfs/server/crypto_ctx.h diff --git a/fs/ksmbd/glob.h b/fs/smbfs/server/glob.h similarity index 100% rename from fs/ksmbd/glob.h rename to fs/smbfs/server/glob.h diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/smbfs/server/ksmbd_netlink.h similarity index 100% rename from fs/ksmbd/ksmbd_netlink.h rename to fs/smbfs/server/ksmbd_netlink.h diff --git a/fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 b/fs/smbfs/server/ksmbd_spnego_negtokeninit.asn1 similarity index 100% rename from fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 rename to fs/smbfs/server/ksmbd_spnego_negtokeninit.asn1 diff --git a/fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 b/fs/smbfs/server/ksmbd_spnego_negtokentarg.asn1 similarity index 100% rename from fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 rename to fs/smbfs/server/ksmbd_spnego_negtokentarg.asn1 diff --git a/fs/ksmbd/ksmbd_work.c b/fs/smbfs/server/ksmbd_work.c similarity index 100% rename from fs/ksmbd/ksmbd_work.c rename to fs/smbfs/server/ksmbd_work.c diff --git a/fs/ksmbd/ksmbd_work.h b/fs/smbfs/server/ksmbd_work.h similarity index 100% rename from fs/ksmbd/ksmbd_work.h rename to fs/smbfs/server/ksmbd_work.h diff --git a/fs/ksmbd/mgmt/ksmbd_ida.c b/fs/smbfs/server/mgmt/ksmbd_ida.c similarity index 100% rename from fs/ksmbd/mgmt/ksmbd_ida.c rename to fs/smbfs/server/mgmt/ksmbd_ida.c diff --git a/fs/ksmbd/mgmt/ksmbd_ida.h b/fs/smbfs/server/mgmt/ksmbd_ida.h similarity index 100% rename from fs/ksmbd/mgmt/ksmbd_ida.h rename to fs/smbfs/server/mgmt/ksmbd_ida.h diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/smbfs/server/mgmt/share_config.c similarity index 100% rename from fs/ksmbd/mgmt/share_config.c rename to fs/smbfs/server/mgmt/share_config.c diff --git a/fs/ksmbd/mgmt/share_config.h b/fs/smbfs/server/mgmt/share_config.h similarity index 100% rename from fs/ksmbd/mgmt/share_config.h rename to fs/smbfs/server/mgmt/share_config.h diff --git a/fs/ksmbd/mgmt/tree_connect.c b/fs/smbfs/server/mgmt/tree_connect.c similarity index 100% rename from fs/ksmbd/mgmt/tree_connect.c rename to fs/smbfs/server/mgmt/tree_connect.c diff --git a/fs/ksmbd/mgmt/tree_connect.h b/fs/smbfs/server/mgmt/tree_connect.h similarity index 100% rename from fs/ksmbd/mgmt/tree_connect.h rename to fs/smbfs/server/mgmt/tree_connect.h diff --git a/fs/ksmbd/mgmt/user_config.c b/fs/smbfs/server/mgmt/user_config.c similarity index 100% rename from fs/ksmbd/mgmt/user_config.c rename to fs/smbfs/server/mgmt/user_config.c diff --git a/fs/ksmbd/mgmt/user_config.h b/fs/smbfs/server/mgmt/user_config.h similarity index 100% rename from fs/ksmbd/mgmt/user_config.h rename to fs/smbfs/server/mgmt/user_config.h diff --git a/fs/ksmbd/mgmt/user_session.c b/fs/smbfs/server/mgmt/user_session.c similarity index 100% rename from fs/ksmbd/mgmt/user_session.c rename to fs/smbfs/server/mgmt/user_session.c diff --git a/fs/ksmbd/mgmt/user_session.h b/fs/smbfs/server/mgmt/user_session.h similarity index 100% rename from fs/ksmbd/mgmt/user_session.h rename to fs/smbfs/server/mgmt/user_session.h diff --git a/fs/ksmbd/misc.c b/fs/smbfs/server/misc.c similarity index 100% rename from fs/ksmbd/misc.c rename to fs/smbfs/server/misc.c diff --git a/fs/ksmbd/misc.h b/fs/smbfs/server/misc.h similarity index 100% rename from fs/ksmbd/misc.h rename to fs/smbfs/server/misc.h diff --git a/fs/ksmbd/ndr.c b/fs/smbfs/server/ndr.c similarity index 100% rename from fs/ksmbd/ndr.c rename to fs/smbfs/server/ndr.c diff --git a/fs/ksmbd/ndr.h b/fs/smbfs/server/ndr.h similarity index 100% rename from fs/ksmbd/ndr.h rename to fs/smbfs/server/ndr.h diff --git a/fs/ksmbd/nterr.h b/fs/smbfs/server/nterr.h similarity index 100% rename from fs/ksmbd/nterr.h rename to fs/smbfs/server/nterr.h diff --git a/fs/ksmbd/ntlmssp.h b/fs/smbfs/server/ntlmssp.h similarity index 100% rename from fs/ksmbd/ntlmssp.h rename to fs/smbfs/server/ntlmssp.h diff --git a/fs/ksmbd/oplock.c b/fs/smbfs/server/oplock.c similarity index 100% rename from fs/ksmbd/oplock.c rename to fs/smbfs/server/oplock.c diff --git a/fs/ksmbd/oplock.h b/fs/smbfs/server/oplock.h similarity index 100% rename from fs/ksmbd/oplock.h rename to fs/smbfs/server/oplock.h diff --git a/fs/ksmbd/server.c b/fs/smbfs/server/server.c similarity index 100% rename from fs/ksmbd/server.c rename to fs/smbfs/server/server.c diff --git a/fs/ksmbd/server.h b/fs/smbfs/server/server.h similarity index 100% rename from fs/ksmbd/server.h rename to fs/smbfs/server/server.h diff --git a/fs/ksmbd/smb2misc.c b/fs/smbfs/server/smb2misc.c similarity index 100% rename from fs/ksmbd/smb2misc.c rename to fs/smbfs/server/smb2misc.c diff --git a/fs/ksmbd/smb2ops.c b/fs/smbfs/server/smb2ops.c similarity index 100% rename from fs/ksmbd/smb2ops.c rename to fs/smbfs/server/smb2ops.c diff --git a/fs/ksmbd/smb2pdu.c b/fs/smbfs/server/smb2pdu.c similarity index 100% rename from fs/ksmbd/smb2pdu.c rename to fs/smbfs/server/smb2pdu.c diff --git a/fs/ksmbd/smb2pdu.h b/fs/smbfs/server/smb2pdu.h similarity index 100% rename from fs/ksmbd/smb2pdu.h rename to fs/smbfs/server/smb2pdu.h diff --git a/fs/ksmbd/smb_common.c b/fs/smbfs/server/smb_common.c similarity index 100% rename from fs/ksmbd/smb_common.c rename to fs/smbfs/server/smb_common.c diff --git a/fs/ksmbd/smb_common.h b/fs/smbfs/server/smb_common.h similarity index 99% rename from fs/ksmbd/smb_common.h rename to fs/smbfs/server/smb_common.h index 9130d2e3cd78..6b0d5f1fe85c 100644 --- a/fs/ksmbd/smb_common.h +++ b/fs/smbfs/server/smb_common.h @@ -10,7 +10,7 @@ #include "glob.h" #include "nterr.h" -#include "../smbfs_common/smb2pdu.h" +#include "../common/smb2pdu.h" #include "smb2pdu.h" /* ksmbd's Specific ERRNO */ diff --git a/fs/ksmbd/smbacl.c b/fs/smbfs/server/smbacl.c similarity index 100% rename from fs/ksmbd/smbacl.c rename to fs/smbfs/server/smbacl.c diff --git a/fs/ksmbd/smbacl.h b/fs/smbfs/server/smbacl.h similarity index 100% rename from fs/ksmbd/smbacl.h rename to fs/smbfs/server/smbacl.h diff --git a/fs/ksmbd/smbfsctl.h b/fs/smbfs/server/smbfsctl.h similarity index 100% rename from fs/ksmbd/smbfsctl.h rename to fs/smbfs/server/smbfsctl.h diff --git a/fs/ksmbd/smbstatus.h b/fs/smbfs/server/smbstatus.h similarity index 100% rename from fs/ksmbd/smbstatus.h rename to fs/smbfs/server/smbstatus.h diff --git a/fs/ksmbd/transport_ipc.c b/fs/smbfs/server/transport_ipc.c similarity index 100% rename from fs/ksmbd/transport_ipc.c rename to fs/smbfs/server/transport_ipc.c diff --git a/fs/ksmbd/transport_ipc.h b/fs/smbfs/server/transport_ipc.h similarity index 100% rename from fs/ksmbd/transport_ipc.h rename to fs/smbfs/server/transport_ipc.h diff --git a/fs/ksmbd/transport_rdma.c b/fs/smbfs/server/transport_rdma.c similarity index 100% rename from fs/ksmbd/transport_rdma.c rename to fs/smbfs/server/transport_rdma.c diff --git a/fs/ksmbd/transport_rdma.h b/fs/smbfs/server/transport_rdma.h similarity index 100% rename from fs/ksmbd/transport_rdma.h rename to fs/smbfs/server/transport_rdma.h diff --git a/fs/ksmbd/transport_tcp.c b/fs/smbfs/server/transport_tcp.c similarity index 100% rename from fs/ksmbd/transport_tcp.c rename to fs/smbfs/server/transport_tcp.c diff --git a/fs/ksmbd/transport_tcp.h b/fs/smbfs/server/transport_tcp.h similarity index 100% rename from fs/ksmbd/transport_tcp.h rename to fs/smbfs/server/transport_tcp.h diff --git a/fs/ksmbd/unicode.c b/fs/smbfs/server/unicode.c similarity index 100% rename from fs/ksmbd/unicode.c rename to fs/smbfs/server/unicode.c diff --git a/fs/ksmbd/unicode.h b/fs/smbfs/server/unicode.h similarity index 100% rename from fs/ksmbd/unicode.h rename to fs/smbfs/server/unicode.h diff --git a/fs/ksmbd/uniupr.h b/fs/smbfs/server/uniupr.h similarity index 100% rename from fs/ksmbd/uniupr.h rename to fs/smbfs/server/uniupr.h diff --git a/fs/ksmbd/vfs.c b/fs/smbfs/server/vfs.c similarity index 100% rename from fs/ksmbd/vfs.c rename to fs/smbfs/server/vfs.c diff --git a/fs/ksmbd/vfs.h b/fs/smbfs/server/vfs.h similarity index 100% rename from fs/ksmbd/vfs.h rename to fs/smbfs/server/vfs.h diff --git a/fs/ksmbd/vfs_cache.c b/fs/smbfs/server/vfs_cache.c similarity index 100% rename from fs/ksmbd/vfs_cache.c rename to fs/smbfs/server/vfs_cache.c diff --git a/fs/ksmbd/vfs_cache.h b/fs/smbfs/server/vfs_cache.h similarity index 100% rename from fs/ksmbd/vfs_cache.h rename to fs/smbfs/server/vfs_cache.h diff --git a/fs/ksmbd/xattr.h b/fs/smbfs/server/xattr.h similarity index 100% rename from fs/ksmbd/xattr.h rename to fs/smbfs/server/xattr.h