Commit 38c8a9a5 authored by Steve French's avatar Steve French
Browse files

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent cb8b02fd

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -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>
































fs/Kconfig



+1
−8






























Original line number
Diff line number
Diff line







@@ -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"
































fs/Makefile



+1
−3






























Original line number
Diff line number
Diff line







@@ -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/
































fs/smb/Kconfig
0 → 100644



+11
−0






























Original line number
Diff line number
Diff line









# 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
























fs/smb/Makefile
0 → 100644



+5
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0



















obj-$(CONFIG_SMBFS)		+= common/









obj-$(CONFIG_CIFS)		+= client/









obj-$(CONFIG_SMB_SERVER)	+= server/