Skip to content

Commit 38c8a9a

Browse files
committed
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 <[email protected]> Acked-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
1 parent cb8b02f commit 38c8a9a

File tree

149 files changed

+30
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+30
-23
lines changed

MAINTAINERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5140,8 +5140,8 @@ S: Supported
51405140
W: https://wiki.samba.org/index.php/LinuxCIFS
51415141
T: git git://git.samba.org/sfrench/cifs-2.6.git
51425142
F: Documentation/admin-guide/cifs/
5143-
F: fs/cifs/
5144-
F: fs/smbfs_common/
5143+
F: fs/smb/client/
5144+
F: fs/smb/common/
51455145
F: include/uapi/linux/cifs
51465146

51475147
COMPACTPCI HOTPLUG CORE
@@ -11301,8 +11301,8 @@ L: [email protected]
1130111301
S: Maintained
1130211302
T: git git://git.samba.org/ksmbd.git
1130311303
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/
1130611306

1130711307
KERNEL UNIT TESTING FRAMEWORK (KUnit)
1130811308
M: Brendan Higgins <[email protected]>

fs/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,14 +368,7 @@ config NFS_V4_2_SSC_HELPER
368368
source "net/sunrpc/Kconfig"
369369
source "fs/ceph/Kconfig"
370370

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"
379372
source "fs/coda/Kconfig"
380373
source "fs/afs/Kconfig"
381374
source "fs/9p/Kconfig"

fs/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,7 @@ obj-$(CONFIG_LOCKD) += lockd/
9595
obj-$(CONFIG_NLS) += nls/
9696
obj-y += unicode/
9797
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/
10199
obj-$(CONFIG_HPFS_FS) += hpfs/
102100
obj-$(CONFIG_NTFS_FS) += ntfs/
103101
obj-$(CONFIG_NTFS3_FS) += ntfs3/

fs/smb/Kconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
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

fs/smb/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
3+
obj-$(CONFIG_SMBFS) += common/
4+
obj-$(CONFIG_CIFS) += client/
5+
obj-$(CONFIG_SMB_SERVER) += server/
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)