Skip to content

Commit 29429a1

Browse files
smfrenchgregkh
authored andcommitted
smb: move client and server files to common directory fs/smb
commit 38c8a9a upstream. 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]> [ added to stable trees to handle the directory change to handle the future stable patches due to the constant churn in this filesystem at the moment - gregkh ] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9d3e4bc commit 29429a1

File tree

147 files changed

+32
-25
lines changed

Some content is hidden

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

147 files changed

+32
-25
lines changed

MAINTAINERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5183,8 +5183,8 @@ S: Supported
51835183
W: https://wiki.samba.org/index.php/LinuxCIFS
51845184
T: git git://git.samba.org/sfrench/cifs-2.6.git
51855185
F: Documentation/admin-guide/cifs/
5186-
F: fs/cifs/
5187-
F: fs/smbfs_common/
5186+
F: fs/smb/client/
5187+
F: fs/smb/common/
51885188
F: include/uapi/linux/cifs
51895189

51905190
COMPACTPCI HOTPLUG CORE
@@ -11168,8 +11168,8 @@ L: [email protected]
1116811168
S: Maintained
1116911169
T: git git://git.samba.org/ksmbd.git
1117011170
F: Documentation/filesystems/cifs/ksmbd.rst
11171-
F: fs/ksmbd/
11172-
F: fs/smbfs_common/
11171+
F: fs/smb/common/
11172+
F: fs/smb/server/
1117311173

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

fs/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,7 @@ config NFS_V4_2_SSC_HELPER
371371
source "net/sunrpc/Kconfig"
372372
source "fs/ceph/Kconfig"
373373

374-
source "fs/cifs/Kconfig"
375-
source "fs/ksmbd/Kconfig"
376-
377-
config SMBFS_COMMON
378-
tristate
379-
default y if CIFS=y || SMB_SERVER=y
380-
default m if CIFS=m || SMB_SERVER=m
381-
374+
source "fs/smb/Kconfig"
382375
source "fs/coda/Kconfig"
383376
source "fs/afs/Kconfig"
384377
source "fs/9p/Kconfig"

fs/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ obj-$(CONFIG_LOCKD) += lockd/
9494
obj-$(CONFIG_NLS) += nls/
9595
obj-y += unicode/
9696
obj-$(CONFIG_SYSV_FS) += sysv/
97-
obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
98-
obj-$(CONFIG_CIFS) += cifs/
99-
obj-$(CONFIG_SMB_SERVER) += ksmbd/
97+
obj-$(CONFIG_SMBFS) += smb/
10098
obj-$(CONFIG_HPFS_FS) += hpfs/
10199
obj-$(CONFIG_NTFS_FS) += ntfs/
102100
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)