tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Steve French 38c8a9a5 cb8b02fd

+30 -23
+4 -4
MAINTAINERS
··· 5140 5140 W: https://wiki.samba.org/index.php/LinuxCIFS 5141 5141 T: git git://git.samba.org/sfrench/cifs-2.6.git 5142 5142 F: Documentation/admin-guide/cifs/ 5143 - F: fs/cifs/ 5144 - F: fs/smbfs_common/ 5143 + F: fs/smb/client/ 5144 + F: fs/smb/common/ 5145 5145 F: include/uapi/linux/cifs 5146 5146 5147 5147 COMPACTPCI HOTPLUG CORE ··· 11301 11301 S: Maintained 11302 11302 T: git git://git.samba.org/ksmbd.git 11303 11303 F: Documentation/filesystems/cifs/ksmbd.rst 11304 - F: fs/ksmbd/ 11305 - F: fs/smbfs_common/ 11304 + F: fs/smb/common/ 11305 + F: fs/smb/server/ 11306 11306 11307 11307 KERNEL UNIT TESTING FRAMEWORK (KUnit) 11308 11308 M: Brendan Higgins <brendanhiggins@google.com>
+1 -8
fs/Kconfig
··· 368 368 source "net/sunrpc/Kconfig" 369 369 source "fs/ceph/Kconfig" 370 370 371 - source "fs/cifs/Kconfig" 372 - source "fs/ksmbd/Kconfig" 373 - 374 - config SMBFS_COMMON 375 - tristate 376 - default y if CIFS=y || SMB_SERVER=y 377 - default m if CIFS=m || SMB_SERVER=m 378 - 371 + source "fs/smb/Kconfig" 379 372 source "fs/coda/Kconfig" 380 373 source "fs/afs/Kconfig" 381 374 source "fs/9p/Kconfig"
+1 -3
fs/Makefile
··· 95 95 obj-$(CONFIG_NLS) += nls/ 96 96 obj-y += unicode/ 97 97 obj-$(CONFIG_SYSV_FS) += sysv/ 98 - obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ 99 - obj-$(CONFIG_CIFS) += cifs/ 100 - obj-$(CONFIG_SMB_SERVER) += ksmbd/ 98 + obj-$(CONFIG_SMBFS) += smb/ 101 99 obj-$(CONFIG_HPFS_FS) += hpfs/ 102 100 obj-$(CONFIG_NTFS_FS) += ntfs/ 103 101 obj-$(CONFIG_NTFS3_FS) += ntfs3/
fs/cifs/Kconfig fs/smb/client/Kconfig
fs/cifs/Makefile fs/smb/client/Makefile
fs/cifs/asn1.c fs/smb/client/asn1.c
fs/cifs/cached_dir.c fs/smb/client/cached_dir.c
fs/cifs/cached_dir.h fs/smb/client/cached_dir.h
fs/cifs/cifs_debug.c fs/smb/client/cifs_debug.c
fs/cifs/cifs_debug.h fs/smb/client/cifs_debug.h
fs/cifs/cifs_dfs_ref.c fs/smb/client/cifs_dfs_ref.c
fs/cifs/cifs_fs_sb.h fs/smb/client/cifs_fs_sb.h
fs/cifs/cifs_ioctl.h fs/smb/client/cifs_ioctl.h
fs/cifs/cifs_spnego.c fs/smb/client/cifs_spnego.c
fs/cifs/cifs_spnego.h fs/smb/client/cifs_spnego.h
fs/cifs/cifs_spnego_negtokeninit.asn1 fs/smb/client/cifs_spnego_negtokeninit.asn1
fs/cifs/cifs_swn.c fs/smb/client/cifs_swn.c
fs/cifs/cifs_swn.h fs/smb/client/cifs_swn.h
fs/cifs/cifs_unicode.c fs/smb/client/cifs_unicode.c
fs/cifs/cifs_unicode.h fs/smb/client/cifs_unicode.h
fs/cifs/cifs_uniupr.h fs/smb/client/cifs_uniupr.h
fs/cifs/cifsacl.c fs/smb/client/cifsacl.c
fs/cifs/cifsacl.h fs/smb/client/cifsacl.h
+1 -1
fs/cifs/cifsencrypt.c fs/smb/client/cifsencrypt.c
··· 21 21 #include <linux/random.h> 22 22 #include <linux/highmem.h> 23 23 #include <linux/fips.h> 24 - #include "../smbfs_common/arc4.h" 24 + #include "../common/arc4.h" 25 25 #include <crypto/aead.h> 26 26 27 27 /*
fs/cifs/cifsfs.c fs/smb/client/cifsfs.c
fs/cifs/cifsfs.h fs/smb/client/cifsfs.h
+1 -1
fs/cifs/cifsglob.h fs/smb/client/cifsglob.h
··· 24 24 #include "cifsacl.h" 25 25 #include <crypto/internal/hash.h> 26 26 #include <uapi/linux/cifs/cifs_mount.h> 27 - #include "../smbfs_common/smb2pdu.h" 27 + #include "../common/smb2pdu.h" 28 28 #include "smb2pdu.h" 29 29 #include <linux/filelock.h> 30 30
+1 -1
fs/cifs/cifspdu.h fs/smb/client/cifspdu.h
··· 11 11 12 12 #include <net/sock.h> 13 13 #include <asm/unaligned.h> 14 - #include "../smbfs_common/smbfsctl.h" 14 + #include "../common/smbfsctl.h" 15 15 16 16 #define CIFS_PROT 0 17 17 #define POSIX_PROT (CIFS_PROT+1)
fs/cifs/cifsproto.h fs/smb/client/cifsproto.h
fs/cifs/cifsroot.c fs/smb/client/cifsroot.c
fs/cifs/cifssmb.c fs/smb/client/cifssmb.c
fs/cifs/connect.c fs/smb/client/connect.c
fs/cifs/dfs.c fs/smb/client/dfs.c
fs/cifs/dfs.h fs/smb/client/dfs.h
fs/cifs/dfs_cache.c fs/smb/client/dfs_cache.c
fs/cifs/dfs_cache.h fs/smb/client/dfs_cache.h
fs/cifs/dir.c fs/smb/client/dir.c
fs/cifs/dns_resolve.c fs/smb/client/dns_resolve.c
fs/cifs/dns_resolve.h fs/smb/client/dns_resolve.h
fs/cifs/export.c fs/smb/client/export.c
fs/cifs/file.c fs/smb/client/file.c
fs/cifs/fs_context.c fs/smb/client/fs_context.c
fs/cifs/fs_context.h fs/smb/client/fs_context.h
fs/cifs/fscache.c fs/smb/client/fscache.c
fs/cifs/fscache.h fs/smb/client/fscache.h
fs/cifs/inode.c fs/smb/client/inode.c
fs/cifs/ioctl.c fs/smb/client/ioctl.c
fs/cifs/link.c fs/smb/client/link.c
fs/cifs/misc.c fs/smb/client/misc.c
fs/cifs/netlink.c fs/smb/client/netlink.c
fs/cifs/netlink.h fs/smb/client/netlink.h
fs/cifs/netmisc.c fs/smb/client/netmisc.c
fs/cifs/nterr.c fs/smb/client/nterr.c
fs/cifs/nterr.h fs/smb/client/nterr.h
fs/cifs/ntlmssp.h fs/smb/client/ntlmssp.h
fs/cifs/readdir.c fs/smb/client/readdir.c
fs/cifs/rfc1002pdu.h fs/smb/client/rfc1002pdu.h
fs/cifs/sess.c fs/smb/client/sess.c
fs/cifs/smb1ops.c fs/smb/client/smb1ops.c
fs/cifs/smb2file.c fs/smb/client/smb2file.c
fs/cifs/smb2glob.h fs/smb/client/smb2glob.h
fs/cifs/smb2inode.c fs/smb/client/smb2inode.c
fs/cifs/smb2maperror.c fs/smb/client/smb2maperror.c
fs/cifs/smb2misc.c fs/smb/client/smb2misc.c
fs/cifs/smb2ops.c fs/smb/client/smb2ops.c
fs/cifs/smb2pdu.c fs/smb/client/smb2pdu.c
fs/cifs/smb2pdu.h fs/smb/client/smb2pdu.h
fs/cifs/smb2proto.h fs/smb/client/smb2proto.h
fs/cifs/smb2status.h fs/smb/client/smb2status.h
fs/cifs/smb2transport.c fs/smb/client/smb2transport.c
fs/cifs/smbdirect.c fs/smb/client/smbdirect.c
fs/cifs/smbdirect.h fs/smb/client/smbdirect.h
+1 -1
fs/cifs/smbencrypt.c fs/smb/client/smbencrypt.c
··· 24 24 #include "cifsglob.h" 25 25 #include "cifs_debug.h" 26 26 #include "cifsproto.h" 27 - #include "../smbfs_common/md4.h" 27 + #include "../common/md4.h" 28 28 29 29 #ifndef false 30 30 #define false 0
fs/cifs/smberr.h fs/smb/client/smberr.h
fs/cifs/trace.c fs/smb/client/trace.c
fs/cifs/trace.h fs/smb/client/trace.h
fs/cifs/transport.c fs/smb/client/transport.c
fs/cifs/unc.c fs/smb/client/unc.c
fs/cifs/winucase.c fs/smb/client/winucase.c
fs/cifs/xattr.c fs/smb/client/xattr.c
fs/ksmbd/Kconfig fs/smb/server/Kconfig
fs/ksmbd/Makefile fs/smb/server/Makefile
fs/ksmbd/asn1.c fs/smb/server/asn1.c
fs/ksmbd/asn1.h fs/smb/server/asn1.h
+1 -1
fs/ksmbd/auth.c fs/smb/server/auth.c
··· 29 29 #include "mgmt/user_config.h" 30 30 #include "crypto_ctx.h" 31 31 #include "transport_ipc.h" 32 - #include "../smbfs_common/arc4.h" 32 + #include "../common/arc4.h" 33 33 34 34 /* 35 35 * Fixed format data defining GSS header and fixed string
fs/ksmbd/auth.h fs/smb/server/auth.h
fs/ksmbd/connection.c fs/smb/server/connection.c
fs/ksmbd/connection.h fs/smb/server/connection.h
fs/ksmbd/crypto_ctx.c fs/smb/server/crypto_ctx.c
fs/ksmbd/crypto_ctx.h fs/smb/server/crypto_ctx.h
fs/ksmbd/glob.h fs/smb/server/glob.h
fs/ksmbd/ksmbd_netlink.h fs/smb/server/ksmbd_netlink.h
fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 fs/smb/server/ksmbd_spnego_negtokeninit.asn1
fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 fs/smb/server/ksmbd_spnego_negtokentarg.asn1
fs/ksmbd/ksmbd_work.c fs/smb/server/ksmbd_work.c
fs/ksmbd/ksmbd_work.h fs/smb/server/ksmbd_work.h
fs/ksmbd/mgmt/ksmbd_ida.c fs/smb/server/mgmt/ksmbd_ida.c
fs/ksmbd/mgmt/ksmbd_ida.h fs/smb/server/mgmt/ksmbd_ida.h
fs/ksmbd/mgmt/share_config.c fs/smb/server/mgmt/share_config.c
fs/ksmbd/mgmt/share_config.h fs/smb/server/mgmt/share_config.h
fs/ksmbd/mgmt/tree_connect.c fs/smb/server/mgmt/tree_connect.c
fs/ksmbd/mgmt/tree_connect.h fs/smb/server/mgmt/tree_connect.h
fs/ksmbd/mgmt/user_config.c fs/smb/server/mgmt/user_config.c
fs/ksmbd/mgmt/user_config.h fs/smb/server/mgmt/user_config.h
fs/ksmbd/mgmt/user_session.c fs/smb/server/mgmt/user_session.c
fs/ksmbd/mgmt/user_session.h fs/smb/server/mgmt/user_session.h
fs/ksmbd/misc.c fs/smb/server/misc.c
fs/ksmbd/misc.h fs/smb/server/misc.h
fs/ksmbd/ndr.c fs/smb/server/ndr.c
fs/ksmbd/ndr.h fs/smb/server/ndr.h
fs/ksmbd/nterr.h fs/smb/server/nterr.h
fs/ksmbd/ntlmssp.h fs/smb/server/ntlmssp.h
fs/ksmbd/oplock.c fs/smb/server/oplock.c
fs/ksmbd/oplock.h fs/smb/server/oplock.h
fs/ksmbd/server.c fs/smb/server/server.c
fs/ksmbd/server.h fs/smb/server/server.h
fs/ksmbd/smb2misc.c fs/smb/server/smb2misc.c
fs/ksmbd/smb2ops.c fs/smb/server/smb2ops.c
fs/ksmbd/smb2pdu.c fs/smb/server/smb2pdu.c
fs/ksmbd/smb2pdu.h fs/smb/server/smb2pdu.h
fs/ksmbd/smb_common.c fs/smb/server/smb_common.c
+1 -1
fs/ksmbd/smb_common.h fs/smb/server/smb_common.h
··· 10 10 11 11 #include "glob.h" 12 12 #include "nterr.h" 13 - #include "../smbfs_common/smb2pdu.h" 13 + #include "../common/smb2pdu.h" 14 14 #include "smb2pdu.h" 15 15 16 16 /* ksmbd's Specific ERRNO */
fs/ksmbd/smbacl.c fs/smb/server/smbacl.c
fs/ksmbd/smbacl.h fs/smb/server/smbacl.h
fs/ksmbd/smbfsctl.h fs/smb/server/smbfsctl.h
fs/ksmbd/smbstatus.h fs/smb/server/smbstatus.h
fs/ksmbd/transport_ipc.c fs/smb/server/transport_ipc.c
fs/ksmbd/transport_ipc.h fs/smb/server/transport_ipc.h
fs/ksmbd/transport_rdma.c fs/smb/server/transport_rdma.c
fs/ksmbd/transport_rdma.h fs/smb/server/transport_rdma.h
fs/ksmbd/transport_tcp.c fs/smb/server/transport_tcp.c
fs/ksmbd/transport_tcp.h fs/smb/server/transport_tcp.h
fs/ksmbd/unicode.c fs/smb/server/unicode.c
fs/ksmbd/unicode.h fs/smb/server/unicode.h
fs/ksmbd/uniupr.h fs/smb/server/uniupr.h
fs/ksmbd/vfs.c fs/smb/server/vfs.c
fs/ksmbd/vfs.h fs/smb/server/vfs.h
fs/ksmbd/vfs_cache.c fs/smb/server/vfs_cache.c
fs/ksmbd/vfs_cache.h fs/smb/server/vfs_cache.h
fs/ksmbd/xattr.h fs/smb/server/xattr.h
+11
fs/smb/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + # 3 + # smbfs configuration 4 + 5 + source "fs/smb/client/Kconfig" 6 + source "fs/smb/server/Kconfig" 7 + 8 + config SMBFS 9 + tristate 10 + default y if CIFS=y || SMB_SERVER=y 11 + default m if CIFS=m || SMB_SERVER=m
+5
fs/smb/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + obj-$(CONFIG_SMBFS) += common/ 4 + obj-$(CONFIG_CIFS) += client/ 5 + obj-$(CONFIG_SMB_SERVER) += server/
+2 -2
fs/smbfs_common/Makefile fs/smb/common/Makefile
··· 3 3 # Makefile for Linux filesystem routines that are shared by client and server. 4 4 # 5 5 6 - obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o 7 - obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o 6 + obj-$(CONFIG_SMBFS) += cifs_arc4.o 7 + obj-$(CONFIG_SMBFS) += cifs_md4.o
fs/smbfs_common/arc4.h fs/smb/common/arc4.h
fs/smbfs_common/cifs_arc4.c fs/smb/common/cifs_arc4.c
fs/smbfs_common/cifs_md4.c fs/smb/common/cifs_md4.c
fs/smbfs_common/md4.h fs/smb/common/md4.h
fs/smbfs_common/smb2pdu.h fs/smb/common/smb2pdu.h
fs/smbfs_common/smbfsctl.h fs/smb/common/smbfsctl.h