diff options
author | Steve French <stfrench@microsoft.com> | 2023-05-21 20:46:30 -0500 |
---|---|---|
committer | Steve French <stfrench@microsoft.com> | 2023-05-24 16:29:21 -0500 |
commit | 38c8a9a52082579090e34c033d439ed2cd1a462d (patch) | |
tree | ca6c3bf5b2b912f32735c1aa0a045cd21a47a205 | |
parent | cb8b02fd6343228966324528adf920bfb8b8e681 (diff) | |
download | linux-38c8a9a52082579090e34c033d439ed2cd1a462d.tar.gz |
smb: move client and server files to common directory fs/smb
Move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko
and helper modules) to new fs/smb subdirectory:
fs/cifs --> fs/smb/client
fs/ksmbd --> fs/smb/server
fs/smbfs_common --> fs/smb/common
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
-rw-r--r-- | MAINTAINERS | 8 | ||||
-rw-r--r-- | fs/Kconfig | 9 | ||||
-rw-r--r-- | fs/Makefile | 4 | ||||
-rw-r--r-- | fs/smb/Kconfig | 11 | ||||
-rw-r--r-- | fs/smb/Makefile | 5 | ||||
-rw-r--r-- | fs/smb/client/Kconfig (renamed from fs/cifs/Kconfig) | 0 | ||||
-rw-r--r-- | fs/smb/client/Makefile (renamed from fs/cifs/Makefile) | 0 | ||||
-rw-r--r-- | fs/smb/client/asn1.c (renamed from fs/cifs/asn1.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cached_dir.c (renamed from fs/cifs/cached_dir.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cached_dir.h (renamed from fs/cifs/cached_dir.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_debug.c (renamed from fs/cifs/cifs_debug.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_debug.h (renamed from fs/cifs/cifs_debug.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_dfs_ref.c (renamed from fs/cifs/cifs_dfs_ref.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_fs_sb.h (renamed from fs/cifs/cifs_fs_sb.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_ioctl.h (renamed from fs/cifs/cifs_ioctl.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_spnego.c (renamed from fs/cifs/cifs_spnego.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_spnego.h (renamed from fs/cifs/cifs_spnego.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_spnego_negtokeninit.asn1 (renamed from fs/cifs/cifs_spnego_negtokeninit.asn1) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_swn.c (renamed from fs/cifs/cifs_swn.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_swn.h (renamed from fs/cifs/cifs_swn.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_unicode.c (renamed from fs/cifs/cifs_unicode.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_unicode.h (renamed from fs/cifs/cifs_unicode.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifs_uniupr.h (renamed from fs/cifs/cifs_uniupr.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsacl.c (renamed from fs/cifs/cifsacl.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsacl.h (renamed from fs/cifs/cifsacl.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsencrypt.c (renamed from fs/cifs/cifsencrypt.c) | 2 | ||||
-rw-r--r-- | fs/smb/client/cifsfs.c (renamed from fs/cifs/cifsfs.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsfs.h (renamed from fs/cifs/cifsfs.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsglob.h (renamed from fs/cifs/cifsglob.h) | 2 | ||||
-rw-r--r-- | fs/smb/client/cifspdu.h (renamed from fs/cifs/cifspdu.h) | 2 | ||||
-rw-r--r-- | fs/smb/client/cifsproto.h (renamed from fs/cifs/cifsproto.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifsroot.c (renamed from fs/cifs/cifsroot.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/cifssmb.c (renamed from fs/cifs/cifssmb.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/connect.c (renamed from fs/cifs/connect.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/dfs.c (renamed from fs/cifs/dfs.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/dfs.h (renamed from fs/cifs/dfs.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/dfs_cache.c (renamed from fs/cifs/dfs_cache.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/dfs_cache.h (renamed from fs/cifs/dfs_cache.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/dir.c (renamed from fs/cifs/dir.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/dns_resolve.c (renamed from fs/cifs/dns_resolve.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/dns_resolve.h (renamed from fs/cifs/dns_resolve.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/export.c (renamed from fs/cifs/export.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/file.c (renamed from fs/cifs/file.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/fs_context.c (renamed from fs/cifs/fs_context.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/fs_context.h (renamed from fs/cifs/fs_context.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/fscache.c (renamed from fs/cifs/fscache.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/fscache.h (renamed from fs/cifs/fscache.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/inode.c (renamed from fs/cifs/inode.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/ioctl.c (renamed from fs/cifs/ioctl.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/link.c (renamed from fs/cifs/link.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/misc.c (renamed from fs/cifs/misc.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/netlink.c (renamed from fs/cifs/netlink.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/netlink.h (renamed from fs/cifs/netlink.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/netmisc.c (renamed from fs/cifs/netmisc.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/nterr.c (renamed from fs/cifs/nterr.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/nterr.h (renamed from fs/cifs/nterr.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/ntlmssp.h (renamed from fs/cifs/ntlmssp.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/readdir.c (renamed from fs/cifs/readdir.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/rfc1002pdu.h (renamed from fs/cifs/rfc1002pdu.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/sess.c (renamed from fs/cifs/sess.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb1ops.c (renamed from fs/cifs/smb1ops.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2file.c (renamed from fs/cifs/smb2file.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2glob.h (renamed from fs/cifs/smb2glob.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2inode.c (renamed from fs/cifs/smb2inode.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2maperror.c (renamed from fs/cifs/smb2maperror.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2misc.c (renamed from fs/cifs/smb2misc.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2ops.c (renamed from fs/cifs/smb2ops.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2pdu.c (renamed from fs/cifs/smb2pdu.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2pdu.h (renamed from fs/cifs/smb2pdu.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2proto.h (renamed from fs/cifs/smb2proto.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2status.h (renamed from fs/cifs/smb2status.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/smb2transport.c (renamed from fs/cifs/smb2transport.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smbdirect.c (renamed from fs/cifs/smbdirect.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/smbdirect.h (renamed from fs/cifs/smbdirect.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/smbencrypt.c (renamed from fs/cifs/smbencrypt.c) | 2 | ||||
-rw-r--r-- | fs/smb/client/smberr.h (renamed from fs/cifs/smberr.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/trace.c (renamed from fs/cifs/trace.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/trace.h (renamed from fs/cifs/trace.h) | 0 | ||||
-rw-r--r-- | fs/smb/client/transport.c (renamed from fs/cifs/transport.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/unc.c (renamed from fs/cifs/unc.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/winucase.c (renamed from fs/cifs/winucase.c) | 0 | ||||
-rw-r--r-- | fs/smb/client/xattr.c (renamed from fs/cifs/xattr.c) | 0 | ||||
-rw-r--r-- | fs/smb/common/Makefile (renamed from fs/smbfs_common/Makefile) | 4 | ||||
-rw-r--r-- | fs/smb/common/arc4.h (renamed from fs/smbfs_common/arc4.h) | 0 | ||||
-rw-r--r-- | fs/smb/common/cifs_arc4.c (renamed from fs/smbfs_common/cifs_arc4.c) | 0 | ||||
-rw-r--r-- | fs/smb/common/cifs_md4.c (renamed from fs/smbfs_common/cifs_md4.c) | 0 | ||||
-rw-r--r-- | fs/smb/common/md4.h (renamed from fs/smbfs_common/md4.h) | 0 | ||||
-rw-r--r-- | fs/smb/common/smb2pdu.h (renamed from fs/smbfs_common/smb2pdu.h) | 0 | ||||
-rw-r--r-- | fs/smb/common/smbfsctl.h (renamed from fs/smbfs_common/smbfsctl.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/Kconfig (renamed from fs/ksmbd/Kconfig) | 0 | ||||
-rw-r--r-- | fs/smb/server/Makefile (renamed from fs/ksmbd/Makefile) | 0 | ||||
-rw-r--r-- | fs/smb/server/asn1.c (renamed from fs/ksmbd/asn1.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/asn1.h (renamed from fs/ksmbd/asn1.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/auth.c (renamed from fs/ksmbd/auth.c) | 2 | ||||
-rw-r--r-- | fs/smb/server/auth.h (renamed from fs/ksmbd/auth.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/connection.c (renamed from fs/ksmbd/connection.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/connection.h (renamed from fs/ksmbd/connection.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/crypto_ctx.c (renamed from fs/ksmbd/crypto_ctx.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/crypto_ctx.h (renamed from fs/ksmbd/crypto_ctx.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/glob.h (renamed from fs/ksmbd/glob.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/ksmbd_netlink.h (renamed from fs/ksmbd/ksmbd_netlink.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/ksmbd_spnego_negtokeninit.asn1 (renamed from fs/ksmbd/ksmbd_spnego_negtokeninit.asn1) | 0 | ||||
-rw-r--r-- | fs/smb/server/ksmbd_spnego_negtokentarg.asn1 (renamed from fs/ksmbd/ksmbd_spnego_negtokentarg.asn1) | 0 | ||||
-rw-r--r-- | fs/smb/server/ksmbd_work.c (renamed from fs/ksmbd/ksmbd_work.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/ksmbd_work.h (renamed from fs/ksmbd/ksmbd_work.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/ksmbd_ida.c (renamed from fs/ksmbd/mgmt/ksmbd_ida.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/ksmbd_ida.h (renamed from fs/ksmbd/mgmt/ksmbd_ida.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/share_config.c (renamed from fs/ksmbd/mgmt/share_config.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/share_config.h (renamed from fs/ksmbd/mgmt/share_config.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/tree_connect.c (renamed from fs/ksmbd/mgmt/tree_connect.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/tree_connect.h (renamed from fs/ksmbd/mgmt/tree_connect.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/user_config.c (renamed from fs/ksmbd/mgmt/user_config.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/user_config.h (renamed from fs/ksmbd/mgmt/user_config.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/user_session.c (renamed from fs/ksmbd/mgmt/user_session.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/mgmt/user_session.h (renamed from fs/ksmbd/mgmt/user_session.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/misc.c (renamed from fs/ksmbd/misc.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/misc.h (renamed from fs/ksmbd/misc.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/ndr.c (renamed from fs/ksmbd/ndr.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/ndr.h (renamed from fs/ksmbd/ndr.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/nterr.h (renamed from fs/ksmbd/nterr.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/ntlmssp.h (renamed from fs/ksmbd/ntlmssp.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/oplock.c (renamed from fs/ksmbd/oplock.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/oplock.h (renamed from fs/ksmbd/oplock.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/server.c (renamed from fs/ksmbd/server.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/server.h (renamed from fs/ksmbd/server.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb2misc.c (renamed from fs/ksmbd/smb2misc.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb2ops.c (renamed from fs/ksmbd/smb2ops.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb2pdu.c (renamed from fs/ksmbd/smb2pdu.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb2pdu.h (renamed from fs/ksmbd/smb2pdu.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb_common.c (renamed from fs/ksmbd/smb_common.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/smb_common.h (renamed from fs/ksmbd/smb_common.h) | 2 | ||||
-rw-r--r-- | fs/smb/server/smbacl.c (renamed from fs/ksmbd/smbacl.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/smbacl.h (renamed from fs/ksmbd/smbacl.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/smbfsctl.h (renamed from fs/ksmbd/smbfsctl.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/smbstatus.h (renamed from fs/ksmbd/smbstatus.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_ipc.c (renamed from fs/ksmbd/transport_ipc.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_ipc.h (renamed from fs/ksmbd/transport_ipc.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_rdma.c (renamed from fs/ksmbd/transport_rdma.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_rdma.h (renamed from fs/ksmbd/transport_rdma.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_tcp.c (renamed from fs/ksmbd/transport_tcp.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/transport_tcp.h (renamed from fs/ksmbd/transport_tcp.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/unicode.c (renamed from fs/ksmbd/unicode.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/unicode.h (renamed from fs/ksmbd/unicode.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/uniupr.h (renamed from fs/ksmbd/uniupr.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/vfs.c (renamed from fs/ksmbd/vfs.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/vfs.h (renamed from fs/ksmbd/vfs.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/vfs_cache.c (renamed from fs/ksmbd/vfs_cache.c) | 0 | ||||
-rw-r--r-- | fs/smb/server/vfs_cache.h (renamed from fs/ksmbd/vfs_cache.h) | 0 | ||||
-rw-r--r-- | fs/smb/server/xattr.h (renamed from fs/ksmbd/xattr.h) | 0 |
149 files changed, 30 insertions, 23 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 27ef1162474810..902f763e845df8 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/smb/client/ +F: fs/smb/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/smb/common/ +F: fs/smb/server/ KERNEL UNIT TESTING FRAMEWORK (KUnit) M: Brendan Higgins <brendanhiggins@google.com> diff --git a/fs/Kconfig b/fs/Kconfig index cc07a0cd317265..18d034ec79539f 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -368,14 +368,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/smb/Kconfig" source "fs/coda/Kconfig" source "fs/afs/Kconfig" source "fs/9p/Kconfig" diff --git a/fs/Makefile b/fs/Makefile index 834f1c3dba4642..5bfdbf0d70373e 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) += smb/ obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_NTFS_FS) += ntfs/ obj-$(CONFIG_NTFS3_FS) += ntfs3/ diff --git a/fs/smb/Kconfig b/fs/smb/Kconfig new file mode 100644 index 00000000000000..ef425789fa6ad2 --- /dev/null +++ b/fs/smb/Kconfig @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# smbfs configuration + +source "fs/smb/client/Kconfig" +source "fs/smb/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/smb/Makefile b/fs/smb/Makefile new file mode 100644 index 00000000000000..9a1bf59a1a651d --- /dev/null +++ b/fs/smb/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/smb/client/Kconfig index 4c0d53bf931a65..4c0d53bf931a65 100644 --- a/fs/cifs/Kconfig +++ b/fs/smb/client/Kconfig diff --git a/fs/cifs/Makefile b/fs/smb/client/Makefile index 304a7f6cc13acb..304a7f6cc13acb 100644 --- a/fs/cifs/Makefile +++ b/fs/smb/client/Makefile diff --git a/fs/cifs/asn1.c b/fs/smb/client/asn1.c index b5724ef9f182f4..b5724ef9f182f4 100644 --- a/fs/cifs/asn1.c +++ b/fs/smb/client/asn1.c diff --git a/fs/cifs/cached_dir.c b/fs/smb/client/cached_dir.c index bfc964b36c72ec..bfc964b36c72ec 100644 --- a/fs/cifs/cached_dir.c +++ b/fs/smb/client/cached_dir.c diff --git a/fs/cifs/cached_dir.h b/fs/smb/client/cached_dir.h index 2f4e764c9ca9a2..2f4e764c9ca9a2 100644 --- a/fs/cifs/cached_dir.h +++ b/fs/smb/client/cached_dir.h diff --git a/fs/cifs/cifs_debug.c b/fs/smb/client/cifs_debug.c index 5034b862cec265..5034b862cec265 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c diff --git a/fs/cifs/cifs_debug.h b/fs/smb/client/cifs_debug.h index ce5cfd236fdb8a..ce5cfd236fdb8a 100644 --- a/fs/cifs/cifs_debug.h +++ b/fs/smb/client/cifs_debug.h diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smb/client/cifs_dfs_ref.c index 0329a907bdfe8a..0329a907bdfe8a 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/smb/client/cifs_dfs_ref.c diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smb/client/cifs_fs_sb.h index 65175919228014..65175919228014 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/smb/client/cifs_fs_sb.h diff --git a/fs/cifs/cifs_ioctl.h b/fs/smb/client/cifs_ioctl.h index 332588e77c311f..332588e77c311f 100644 --- a/fs/cifs/cifs_ioctl.h +++ b/fs/smb/client/cifs_ioctl.h diff --git a/fs/cifs/cifs_spnego.c b/fs/smb/client/cifs_spnego.c index 6f3285f1dfee58..6f3285f1dfee58 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/smb/client/cifs_spnego.c diff --git a/fs/cifs/cifs_spnego.h b/fs/smb/client/cifs_spnego.h index e4d751b0c81277..e4d751b0c81277 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/smb/client/cifs_spnego.h diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smb/client/cifs_spnego_negtokeninit.asn1 index 181c083887d513..181c083887d513 100644 --- a/fs/cifs/cifs_spnego_negtokeninit.asn1 +++ b/fs/smb/client/cifs_spnego_negtokeninit.asn1 diff --git a/fs/cifs/cifs_swn.c b/fs/smb/client/cifs_swn.c index 7233c6a7e6d70b..7233c6a7e6d70b 100644 --- a/fs/cifs/cifs_swn.c +++ b/fs/smb/client/cifs_swn.c diff --git a/fs/cifs/cifs_swn.h b/fs/smb/client/cifs_swn.h index 8a9d2a5c9077e8..8a9d2a5c9077e8 100644 --- a/fs/cifs/cifs_swn.h +++ b/fs/smb/client/cifs_swn.h diff --git a/fs/cifs/cifs_unicode.c b/fs/smb/client/cifs_unicode.c index e7582dd791794c..e7582dd791794c 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/smb/client/cifs_unicode.c diff --git a/fs/cifs/cifs_unicode.h b/fs/smb/client/cifs_unicode.h index 80b3d845419faa..80b3d845419faa 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/smb/client/cifs_unicode.h diff --git a/fs/cifs/cifs_uniupr.h b/fs/smb/client/cifs_uniupr.h index 7b272fcdf0d3af..7b272fcdf0d3af 100644 --- a/fs/cifs/cifs_uniupr.h +++ b/fs/smb/client/cifs_uniupr.h diff --git a/fs/cifs/cifsacl.c b/fs/smb/client/cifsacl.c index f5b6df82e8570a..f5b6df82e8570a 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/smb/client/cifsacl.c diff --git a/fs/cifs/cifsacl.h b/fs/smb/client/cifsacl.h index ccbfc754bd3c7f..ccbfc754bd3c7f 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/smb/client/cifsacl.h diff --git a/fs/cifs/cifsencrypt.c b/fs/smb/client/cifsencrypt.c index 357bd27a7fd15b..ef4c2e3c9fa613 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/smb/client/cifsencrypt.c @@ -21,7 +21,7 @@ #include <linux/random.h> #include <linux/highmem.h> #include <linux/fips.h> -#include "../smbfs_common/arc4.h" +#include "../common/arc4.h" #include <crypto/aead.h> /* diff --git a/fs/cifs/cifsfs.c b/fs/smb/client/cifsfs.c index 43a4d8603db341..43a4d8603db341 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/smb/client/cifsfs.c diff --git a/fs/cifs/cifsfs.h b/fs/smb/client/cifsfs.h index 74cd6fafb33e8b..74cd6fafb33e8b 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/smb/client/cifsfs.h diff --git a/fs/cifs/cifsglob.h b/fs/smb/client/cifsglob.h index 5f8fd20951af37..0d84bb1a8cd9d7 100644 --- a/fs/cifs/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 "../smbfs_common/smb2pdu.h" +#include "../common/smb2pdu.h" #include "smb2pdu.h" #include <linux/filelock.h> diff --git a/fs/cifs/cifspdu.h b/fs/smb/client/cifspdu.h index 445e3eaebcc190..e17222fec9d290 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/smb/client/cifspdu.h @@ -11,7 +11,7 @@ #include <net/sock.h> #include <asm/unaligned.h> -#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/smb/client/cifsproto.h index c1c704990b9861..c1c704990b9861 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/smb/client/cifsproto.h diff --git a/fs/cifs/cifsroot.c b/fs/smb/client/cifsroot.c index 56ec1b233f52e2..56ec1b233f52e2 100644 --- a/fs/cifs/cifsroot.c +++ b/fs/smb/client/cifsroot.c diff --git a/fs/cifs/cifssmb.c b/fs/smb/client/cifssmb.c index 9d963caec35c8d..9d963caec35c8d 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/smb/client/cifssmb.c diff --git a/fs/cifs/connect.c b/fs/smb/client/connect.c index 8e9a672320ab72..8e9a672320ab72 100644 --- a/fs/cifs/connect.c +++ b/fs/smb/client/connect.c diff --git a/fs/cifs/dfs.c b/fs/smb/client/dfs.c index 2f93bf8c3325ac..2f93bf8c3325ac 100644 --- a/fs/cifs/dfs.c +++ b/fs/smb/client/dfs.c diff --git a/fs/cifs/dfs.h b/fs/smb/client/dfs.h index 1c90df5ecfbdae..1c90df5ecfbdae 100644 --- a/fs/cifs/dfs.h +++ b/fs/smb/client/dfs.h diff --git a/fs/cifs/dfs_cache.c b/fs/smb/client/dfs_cache.c index 1513b2709889b7..1513b2709889b7 100644 --- a/fs/cifs/dfs_cache.c +++ b/fs/smb/client/dfs_cache.c diff --git a/fs/cifs/dfs_cache.h b/fs/smb/client/dfs_cache.h index c6d89cd6d4fd78..c6d89cd6d4fd78 100644 --- a/fs/cifs/dfs_cache.h +++ b/fs/smb/client/dfs_cache.h diff --git a/fs/cifs/dir.c b/fs/smb/client/dir.c index 30b1e1bfd204ae..30b1e1bfd204ae 100644 --- a/fs/cifs/dir.c +++ b/fs/smb/client/dir.c diff --git a/fs/cifs/dns_resolve.c b/fs/smb/client/dns_resolve.c index 8bf8978bc5d66c..8bf8978bc5d66c 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/smb/client/dns_resolve.c diff --git a/fs/cifs/dns_resolve.h b/fs/smb/client/dns_resolve.h index 6eb0c15a244066..6eb0c15a244066 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/smb/client/dns_resolve.h diff --git a/fs/cifs/export.c b/fs/smb/client/export.c index 37c28415df1e02..37c28415df1e02 100644 --- a/fs/cifs/export.c +++ b/fs/smb/client/export.c diff --git a/fs/cifs/file.c b/fs/smb/client/file.c index df88b8c04d03d8..df88b8c04d03d8 100644 --- a/fs/cifs/file.c +++ b/fs/smb/client/file.c diff --git a/fs/cifs/fs_context.c b/fs/smb/client/fs_context.c index 1bda75609b6422..1bda75609b6422 100644 --- a/fs/cifs/fs_context.c +++ b/fs/smb/client/fs_context.c diff --git a/fs/cifs/fs_context.h b/fs/smb/client/fs_context.h index f4eaf855890222..f4eaf855890222 100644 --- a/fs/cifs/fs_context.h +++ b/fs/smb/client/fs_context.h diff --git a/fs/cifs/fscache.c b/fs/smb/client/fscache.c index 8f6909d633da8a..8f6909d633da8a 100644 --- a/fs/cifs/fscache.c +++ b/fs/smb/client/fscache.c diff --git a/fs/cifs/fscache.h b/fs/smb/client/fscache.h index 1739996109975a..1739996109975a 100644 --- a/fs/cifs/fscache.h +++ b/fs/smb/client/fscache.h diff --git a/fs/cifs/inode.c b/fs/smb/client/inode.c index 1087ac6104a970..1087ac6104a970 100644 --- a/fs/cifs/inode.c +++ b/fs/smb/client/inode.c diff --git a/fs/cifs/ioctl.c b/fs/smb/client/ioctl.c index cb3be58cd55eb0..cb3be58cd55eb0 100644 --- a/fs/cifs/ioctl.c +++ b/fs/smb/client/ioctl.c diff --git a/fs/cifs/link.c b/fs/smb/client/link.c index c66be4904e1fa0..c66be4904e1fa0 100644 --- a/fs/cifs/link.c +++ b/fs/smb/client/link.c diff --git a/fs/cifs/misc.c b/fs/smb/client/misc.c index cd914be905b244..cd914be905b244 100644 --- a/fs/cifs/misc.c +++ b/fs/smb/client/misc.c diff --git a/fs/cifs/netlink.c b/fs/smb/client/netlink.c index 147d9409252cd3..147d9409252cd3 100644 --- a/fs/cifs/netlink.c +++ b/fs/smb/client/netlink.c diff --git a/fs/cifs/netlink.h b/fs/smb/client/netlink.h index e2fa8ed24c5460..e2fa8ed24c5460 100644 --- a/fs/cifs/netlink.h +++ b/fs/smb/client/netlink.h diff --git a/fs/cifs/netmisc.c b/fs/smb/client/netmisc.c index 1b52e6ac431cb0..1b52e6ac431cb0 100644 --- a/fs/cifs/netmisc.c +++ b/fs/smb/client/netmisc.c diff --git a/fs/cifs/nterr.c b/fs/smb/client/nterr.c index 358a766375b4a2..358a766375b4a2 100644 --- a/fs/cifs/nterr.c +++ b/fs/smb/client/nterr.c diff --git a/fs/cifs/nterr.h b/fs/smb/client/nterr.h index edd4741cab0a17..edd4741cab0a17 100644 --- a/fs/cifs/nterr.h +++ b/fs/smb/client/nterr.h diff --git a/fs/cifs/ntlmssp.h b/fs/smb/client/ntlmssp.h index 2c5dde2ece588a..2c5dde2ece588a 100644 --- a/fs/cifs/ntlmssp.h +++ b/fs/smb/client/ntlmssp.h diff --git a/fs/cifs/readdir.c b/fs/smb/client/readdir.c index ef638086d7341b..ef638086d7341b 100644 --- a/fs/cifs/readdir.c +++ b/fs/smb/client/readdir.c diff --git a/fs/cifs/rfc1002pdu.h b/fs/smb/client/rfc1002pdu.h index ae1d025da294a8..ae1d025da294a8 100644 --- a/fs/cifs/rfc1002pdu.h +++ b/fs/smb/client/rfc1002pdu.h diff --git a/fs/cifs/sess.c b/fs/smb/client/sess.c index 335c078c42fb5e..335c078c42fb5e 100644 --- a/fs/cifs/sess.c +++ b/fs/smb/client/sess.c diff --git a/fs/cifs/smb1ops.c b/fs/smb/client/smb1ops.c index 7d1b3fc014d94a..7d1b3fc014d94a 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/smb/client/smb1ops.c diff --git a/fs/cifs/smb2file.c b/fs/smb/client/smb2file.c index e0ee96d69d4952..e0ee96d69d4952 100644 --- a/fs/cifs/smb2file.c +++ b/fs/smb/client/smb2file.c diff --git a/fs/cifs/smb2glob.h b/fs/smb/client/smb2glob.h index 82e916ad167c00..82e916ad167c00 100644 --- a/fs/cifs/smb2glob.h +++ b/fs/smb/client/smb2glob.h diff --git a/fs/cifs/smb2inode.c b/fs/smb/client/smb2inode.c index 163a03298430d0..163a03298430d0 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/smb/client/smb2inode.c diff --git a/fs/cifs/smb2maperror.c b/fs/smb/client/smb2maperror.c index 194799ddd38288..194799ddd38288 100644 --- a/fs/cifs/smb2maperror.c +++ b/fs/smb/client/smb2maperror.c diff --git a/fs/cifs/smb2misc.c b/fs/smb/client/smb2misc.c index 3935a60db5c310..3935a60db5c310 100644 --- a/fs/cifs/smb2misc.c +++ b/fs/smb/client/smb2misc.c diff --git a/fs/cifs/smb2ops.c b/fs/smb/client/smb2ops.c index 5065398665f115..5065398665f115 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/smb/client/smb2ops.c diff --git a/fs/cifs/smb2pdu.c b/fs/smb/client/smb2pdu.c index 9ed61b6f9b2193..9ed61b6f9b2193 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/smb/client/smb2pdu.c diff --git a/fs/cifs/smb2pdu.h b/fs/smb/client/smb2pdu.h index 220994d0a0f7f6..220994d0a0f7f6 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/smb/client/smb2pdu.h diff --git a/fs/cifs/smb2proto.h b/fs/smb/client/smb2proto.h index d5d7ffb7711c46..d5d7ffb7711c46 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/smb/client/smb2proto.h diff --git a/fs/cifs/smb2status.h b/fs/smb/client/smb2status.h index a9e958166fc53a..a9e958166fc53a 100644 --- a/fs/cifs/smb2status.h +++ b/fs/smb/client/smb2status.h diff --git a/fs/cifs/smb2transport.c b/fs/smb/client/smb2transport.c index 790acf65a0926c..790acf65a0926c 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/smb/client/smb2transport.c diff --git a/fs/cifs/smbdirect.c b/fs/smb/client/smbdirect.c index 0362ebd4fa0fc2..0362ebd4fa0fc2 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/smb/client/smbdirect.c diff --git a/fs/cifs/smbdirect.h b/fs/smb/client/smbdirect.h index 83f239f376f06d..83f239f376f06d 100644 --- a/fs/cifs/smbdirect.h +++ b/fs/smb/client/smbdirect.h diff --git a/fs/cifs/smbencrypt.c b/fs/smb/client/smbencrypt.c index 4a048775386910..f0ce26414f1737 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/smb/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/smb/client/smberr.h index aeffdad829e2e4..aeffdad829e2e4 100644 --- a/fs/cifs/smberr.h +++ b/fs/smb/client/smberr.h diff --git a/fs/cifs/trace.c b/fs/smb/client/trace.c index 4654837871934f..4654837871934f 100644 --- a/fs/cifs/trace.c +++ b/fs/smb/client/trace.c diff --git a/fs/cifs/trace.h b/fs/smb/client/trace.h index d3053bd8ae7312..d3053bd8ae7312 100644 --- a/fs/cifs/trace.h +++ b/fs/smb/client/trace.h diff --git a/fs/cifs/transport.c b/fs/smb/client/transport.c index 24bdd5f4d3bcc7..24bdd5f4d3bcc7 100644 --- a/fs/cifs/transport.c +++ b/fs/smb/client/transport.c diff --git a/fs/cifs/unc.c b/fs/smb/client/unc.c index f6fc5e343ea42b..f6fc5e343ea42b 100644 --- a/fs/cifs/unc.c +++ b/fs/smb/client/unc.c diff --git a/fs/cifs/winucase.c b/fs/smb/client/winucase.c index 2f075b5b50df04..2f075b5b50df04 100644 --- a/fs/cifs/winucase.c +++ b/fs/smb/client/winucase.c diff --git a/fs/cifs/xattr.c b/fs/smb/client/xattr.c index 4ad5531686d81a..4ad5531686d81a 100644 --- a/fs/cifs/xattr.c +++ b/fs/smb/client/xattr.c diff --git a/fs/smbfs_common/Makefile b/fs/smb/common/Makefile index cafc61a3bfc372..c66dbbc1469c3f 100644 --- a/fs/smbfs_common/Makefile +++ b/fs/smb/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/smb/common/arc4.h index 12e71ec033a184..12e71ec033a184 100644 --- a/fs/smbfs_common/arc4.h +++ b/fs/smb/common/arc4.h diff --git a/fs/smbfs_common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c index 043e4cb839fa23..043e4cb839fa23 100644 --- a/fs/smbfs_common/cifs_arc4.c +++ b/fs/smb/common/cifs_arc4.c diff --git a/fs/smbfs_common/cifs_md4.c b/fs/smb/common/cifs_md4.c index 50f78cfc6ce921..50f78cfc6ce921 100644 --- a/fs/smbfs_common/cifs_md4.c +++ b/fs/smb/common/cifs_md4.c diff --git a/fs/smbfs_common/md4.h b/fs/smb/common/md4.h index 5337becc699ab9..5337becc699ab9 100644 --- a/fs/smbfs_common/md4.h +++ b/fs/smb/common/md4.h diff --git a/fs/smbfs_common/smb2pdu.h b/fs/smb/common/smb2pdu.h index bae590eec871f5..bae590eec871f5 100644 --- a/fs/smbfs_common/smb2pdu.h +++ b/fs/smb/common/smb2pdu.h diff --git a/fs/smbfs_common/smbfsctl.h b/fs/smb/common/smbfsctl.h index edd7fc2a7921b8..edd7fc2a7921b8 100644 --- a/fs/smbfs_common/smbfsctl.h +++ b/fs/smb/common/smbfsctl.h diff --git a/fs/ksmbd/Kconfig b/fs/smb/server/Kconfig index 7055cb5d288008..7055cb5d288008 100644 --- a/fs/ksmbd/Kconfig +++ b/fs/smb/server/Kconfig diff --git a/fs/ksmbd/Makefile b/fs/smb/server/Makefile index 7d6337a7dee40c..7d6337a7dee40c 100644 --- a/fs/ksmbd/Makefile +++ b/fs/smb/server/Makefile diff --git a/fs/ksmbd/asn1.c b/fs/smb/server/asn1.c index cc6384f7967599..cc6384f7967599 100644 --- a/fs/ksmbd/asn1.c +++ b/fs/smb/server/asn1.c diff --git a/fs/ksmbd/asn1.h b/fs/smb/server/asn1.h index ce105f4ce305a4..ce105f4ce305a4 100644 --- a/fs/ksmbd/asn1.h +++ b/fs/smb/server/asn1.h diff --git a/fs/ksmbd/auth.c b/fs/smb/server/auth.c index df8fb076f6f141..5e5e120edcc22d 100644 --- a/fs/ksmbd/auth.c +++ b/fs/smb/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/smb/server/auth.h index 362b6159a6cffb..362b6159a6cffb 100644 --- a/fs/ksmbd/auth.h +++ b/fs/smb/server/auth.h diff --git a/fs/ksmbd/connection.c b/fs/smb/server/connection.c index 4882a812ea8673..4882a812ea8673 100644 --- a/fs/ksmbd/connection.c +++ b/fs/smb/server/connection.c diff --git a/fs/ksmbd/connection.h b/fs/smb/server/connection.h index ad8dfaa48ffb38..ad8dfaa48ffb38 100644 --- a/fs/ksmbd/connection.h +++ b/fs/smb/server/connection.h diff --git a/fs/ksmbd/crypto_ctx.c b/fs/smb/server/crypto_ctx.c index 81488d04199da8..81488d04199da8 100644 --- a/fs/ksmbd/crypto_ctx.c +++ b/fs/smb/server/crypto_ctx.c diff --git a/fs/ksmbd/crypto_ctx.h b/fs/smb/server/crypto_ctx.h index 4a367c62f65366..4a367c62f65366 100644 --- a/fs/ksmbd/crypto_ctx.h +++ b/fs/smb/server/crypto_ctx.h diff --git a/fs/ksmbd/glob.h b/fs/smb/server/glob.h index 5b8f3e0ebdb36a..5b8f3e0ebdb36a 100644 --- a/fs/ksmbd/glob.h +++ b/fs/smb/server/glob.h diff --git a/fs/ksmbd/ksmbd_netlink.h b/fs/smb/server/ksmbd_netlink.h index fb8b2d566efb66..fb8b2d566efb66 100644 --- a/fs/ksmbd/ksmbd_netlink.h +++ b/fs/smb/server/ksmbd_netlink.h diff --git a/fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 b/fs/smb/server/ksmbd_spnego_negtokeninit.asn1 index 0065f191b54b7a..0065f191b54b7a 100644 --- a/fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 +++ b/fs/smb/server/ksmbd_spnego_negtokeninit.asn1 diff --git a/fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 b/fs/smb/server/ksmbd_spnego_negtokentarg.asn1 index 1151933e7b9c58..1151933e7b9c58 100644 --- a/fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 +++ b/fs/smb/server/ksmbd_spnego_negtokentarg.asn1 diff --git a/fs/ksmbd/ksmbd_work.c b/fs/smb/server/ksmbd_work.c index 14b9caebf7a4f8..14b9caebf7a4f8 100644 --- a/fs/ksmbd/ksmbd_work.c +++ b/fs/smb/server/ksmbd_work.c diff --git a/fs/ksmbd/ksmbd_work.h b/fs/smb/server/ksmbd_work.h index f8ae6144c0aea6..f8ae6144c0aea6 100644 --- a/fs/ksmbd/ksmbd_work.h +++ b/fs/smb/server/ksmbd_work.h diff --git a/fs/ksmbd/mgmt/ksmbd_ida.c b/fs/smb/server/mgmt/ksmbd_ida.c index 54194d959a5ef6..54194d959a5ef6 100644 --- a/fs/ksmbd/mgmt/ksmbd_ida.c +++ b/fs/smb/server/mgmt/ksmbd_ida.c diff --git a/fs/ksmbd/mgmt/ksmbd_ida.h b/fs/smb/server/mgmt/ksmbd_ida.h index 2bc07b16cfde9b..2bc07b16cfde9b 100644 --- a/fs/ksmbd/mgmt/ksmbd_ida.h +++ b/fs/smb/server/mgmt/ksmbd_ida.h diff --git a/fs/ksmbd/mgmt/share_config.c b/fs/smb/server/mgmt/share_config.c index 328a412259dc1b..328a412259dc1b 100644 --- a/fs/ksmbd/mgmt/share_config.c +++ b/fs/smb/server/mgmt/share_config.c diff --git a/fs/ksmbd/mgmt/share_config.h b/fs/smb/server/mgmt/share_config.h index 3fd33829394219..3fd33829394219 100644 --- a/fs/ksmbd/mgmt/share_config.h +++ b/fs/smb/server/mgmt/share_config.h diff --git a/fs/ksmbd/mgmt/tree_connect.c b/fs/smb/server/mgmt/tree_connect.c index f07a05f376513e..f07a05f376513e 100644 --- a/fs/ksmbd/mgmt/tree_connect.c +++ b/fs/smb/server/mgmt/tree_connect.c diff --git a/fs/ksmbd/mgmt/tree_connect.h b/fs/smb/server/mgmt/tree_connect.h index 700df36cf3e301..700df36cf3e301 100644 --- a/fs/ksmbd/mgmt/tree_connect.h +++ b/fs/smb/server/mgmt/tree_connect.h diff --git a/fs/ksmbd/mgmt/user_config.c b/fs/smb/server/mgmt/user_config.c index 279d00feff2168..279d00feff2168 100644 --- a/fs/ksmbd/mgmt/user_config.c +++ b/fs/smb/server/mgmt/user_config.c diff --git a/fs/ksmbd/mgmt/user_config.h b/fs/smb/server/mgmt/user_config.h index 6a44109617f149..6a44109617f149 100644 --- a/fs/ksmbd/mgmt/user_config.h +++ b/fs/smb/server/mgmt/user_config.h diff --git a/fs/ksmbd/mgmt/user_session.c b/fs/smb/server/mgmt/user_session.c index 8a5dcab05614f1..8a5dcab05614f1 100644 --- a/fs/ksmbd/mgmt/user_session.c +++ b/fs/smb/server/mgmt/user_session.c diff --git a/fs/ksmbd/mgmt/user_session.h b/fs/smb/server/mgmt/user_session.h index f99d475b28db45..f99d475b28db45 100644 --- a/fs/ksmbd/mgmt/user_session.h +++ b/fs/smb/server/mgmt/user_session.h diff --git a/fs/ksmbd/misc.c b/fs/smb/server/misc.c index 9e8afaa686e3aa..9e8afaa686e3aa 100644 --- a/fs/ksmbd/misc.c +++ b/fs/smb/server/misc.c diff --git a/fs/ksmbd/misc.h b/fs/smb/server/misc.h index 1facfcd21200fd..1facfcd21200fd 100644 --- a/fs/ksmbd/misc.h +++ b/fs/smb/server/misc.h diff --git a/fs/ksmbd/ndr.c b/fs/smb/server/ndr.c index 3507d8f8907499..3507d8f8907499 100644 --- a/fs/ksmbd/ndr.c +++ b/fs/smb/server/ndr.c diff --git a/fs/ksmbd/ndr.h b/fs/smb/server/ndr.h index f3c108c8cf4dbf..f3c108c8cf4dbf 100644 --- a/fs/ksmbd/ndr.h +++ b/fs/smb/server/ndr.h diff --git a/fs/ksmbd/nterr.h b/fs/smb/server/nterr.h index 2f358f88a01883..2f358f88a01883 100644 --- a/fs/ksmbd/nterr.h +++ b/fs/smb/server/nterr.h diff --git a/fs/ksmbd/ntlmssp.h b/fs/smb/server/ntlmssp.h index f13153c18b4e9e..f13153c18b4e9e 100644 --- a/fs/ksmbd/ntlmssp.h +++ b/fs/smb/server/ntlmssp.h diff --git a/fs/ksmbd/oplock.c b/fs/smb/server/oplock.c index 6d1ccb99989398..6d1ccb99989398 100644 --- a/fs/ksmbd/oplock.c +++ b/fs/smb/server/oplock.c diff --git a/fs/ksmbd/oplock.h b/fs/smb/server/oplock.h index 4b0fe6da76940f..4b0fe6da76940f 100644 --- a/fs/ksmbd/oplock.h +++ b/fs/smb/server/oplock.h diff --git a/fs/ksmbd/server.c b/fs/smb/server/server.c index f9b2e0f19b03ba..f9b2e0f19b03ba 100644 --- a/fs/ksmbd/server.c +++ b/fs/smb/server/server.c diff --git a/fs/ksmbd/server.h b/fs/smb/server/server.h index db727818176038..db727818176038 100644 --- a/fs/ksmbd/server.h +++ b/fs/smb/server/server.h diff --git a/fs/ksmbd/smb2misc.c b/fs/smb/server/smb2misc.c index 0ffe663b75906a..0ffe663b75906a 100644 --- a/fs/ksmbd/smb2misc.c +++ b/fs/smb/server/smb2misc.c diff --git a/fs/ksmbd/smb2ops.c b/fs/smb/server/smb2ops.c index aed7704a067286..aed7704a067286 100644 --- a/fs/ksmbd/smb2ops.c +++ b/fs/smb/server/smb2ops.c diff --git a/fs/ksmbd/smb2pdu.c b/fs/smb/server/smb2pdu.c index 717bcd20545b7c..717bcd20545b7c 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c diff --git a/fs/ksmbd/smb2pdu.h b/fs/smb/server/smb2pdu.h index 2767c08a534a3b..2767c08a534a3b 100644 --- a/fs/ksmbd/smb2pdu.h +++ b/fs/smb/server/smb2pdu.h diff --git a/fs/ksmbd/smb_common.c b/fs/smb/server/smb_common.c index af0c2a9b85290d..af0c2a9b85290d 100644 --- a/fs/ksmbd/smb_common.c +++ b/fs/smb/server/smb_common.c diff --git a/fs/ksmbd/smb_common.h b/fs/smb/server/smb_common.h index 9130d2e3cd78c0..6b0d5f1fe85ca5 100644 --- a/fs/ksmbd/smb_common.h +++ b/fs/smb/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/smb/server/smbacl.c index 6d6cfb6957a99e..6d6cfb6957a99e 100644 --- a/fs/ksmbd/smbacl.c +++ b/fs/smb/server/smbacl.c diff --git a/fs/ksmbd/smbacl.h b/fs/smb/server/smbacl.h index 49a8c292bd2e81..49a8c292bd2e81 100644 --- a/fs/ksmbd/smbacl.h +++ b/fs/smb/server/smbacl.h diff --git a/fs/ksmbd/smbfsctl.h b/fs/smb/server/smbfsctl.h index b98418aae20cd5..b98418aae20cd5 100644 --- a/fs/ksmbd/smbfsctl.h +++ b/fs/smb/server/smbfsctl.h diff --git a/fs/ksmbd/smbstatus.h b/fs/smb/server/smbstatus.h index 108a8b6ed24a00..108a8b6ed24a00 100644 --- a/fs/ksmbd/smbstatus.h +++ b/fs/smb/server/smbstatus.h diff --git a/fs/ksmbd/transport_ipc.c b/fs/smb/server/transport_ipc.c index 40c721f9227e4a..40c721f9227e4a 100644 --- a/fs/ksmbd/transport_ipc.c +++ b/fs/smb/server/transport_ipc.c diff --git a/fs/ksmbd/transport_ipc.h b/fs/smb/server/transport_ipc.h index 5e5b90a0c1879c..5e5b90a0c1879c 100644 --- a/fs/ksmbd/transport_ipc.h +++ b/fs/smb/server/transport_ipc.h diff --git a/fs/ksmbd/transport_rdma.c b/fs/smb/server/transport_rdma.c index c06efc020bd954..c06efc020bd954 100644 --- a/fs/ksmbd/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c diff --git a/fs/ksmbd/transport_rdma.h b/fs/smb/server/transport_rdma.h index 77aee4e5c9dcd8..77aee4e5c9dcd8 100644 --- a/fs/ksmbd/transport_rdma.h +++ b/fs/smb/server/transport_rdma.h diff --git a/fs/ksmbd/transport_tcp.c b/fs/smb/server/transport_tcp.c index eff7a1d793f003..eff7a1d793f003 100644 --- a/fs/ksmbd/transport_tcp.c +++ b/fs/smb/server/transport_tcp.c diff --git a/fs/ksmbd/transport_tcp.h b/fs/smb/server/transport_tcp.h index e338bebe322f10..e338bebe322f10 100644 --- a/fs/ksmbd/transport_tcp.h +++ b/fs/smb/server/transport_tcp.h diff --git a/fs/ksmbd/unicode.c b/fs/smb/server/unicode.c index 9ae676906ed394..9ae676906ed394 100644 --- a/fs/ksmbd/unicode.c +++ b/fs/smb/server/unicode.c diff --git a/fs/ksmbd/unicode.h b/fs/smb/server/unicode.h index 076f6034a7899b..076f6034a7899b 100644 --- a/fs/ksmbd/unicode.h +++ b/fs/smb/server/unicode.h diff --git a/fs/ksmbd/uniupr.h b/fs/smb/server/uniupr.h index 26583b776897b6..26583b776897b6 100644 --- a/fs/ksmbd/uniupr.h +++ b/fs/smb/server/uniupr.h diff --git a/fs/ksmbd/vfs.c b/fs/smb/server/vfs.c index 778c152708e433..778c152708e433 100644 --- a/fs/ksmbd/vfs.c +++ b/fs/smb/server/vfs.c diff --git a/fs/ksmbd/vfs.h b/fs/smb/server/vfs.h index a4ae89f3230de7..a4ae89f3230de7 100644 --- a/fs/ksmbd/vfs.h +++ b/fs/smb/server/vfs.h diff --git a/fs/ksmbd/vfs_cache.c b/fs/smb/server/vfs_cache.c index 2d0138e72d7834..2d0138e72d7834 100644 --- a/fs/ksmbd/vfs_cache.c +++ b/fs/smb/server/vfs_cache.c diff --git a/fs/ksmbd/vfs_cache.h b/fs/smb/server/vfs_cache.h index fcb13413fa8d93..fcb13413fa8d93 100644 --- a/fs/ksmbd/vfs_cache.h +++ b/fs/smb/server/vfs_cache.h diff --git a/fs/ksmbd/xattr.h b/fs/smb/server/xattr.h index 16499ca5c82d36..16499ca5c82d36 100644 --- a/fs/ksmbd/xattr.h +++ b/fs/smb/server/xattr.h |