smb: move client and server files to common directory fs/smb
JIRA: https://issues.redhat.com/browse/RHEL-11577 Conflicts: RHEL 9 doesn't have ksmbd, so all ksmbd-related changes have been dropped. Also includes a RHEL-specific change to update filter-modules.sh. commit 38c8a9a52082579090e34c033d439ed2cd1a462d Author: Steve French <stfrench@microsoft.com> Date: Sun May 21 20:46:30 2023 -0500 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> Signed-off-by: Scott Mayhew <smayhew@redhat.com>
This commit is contained in:
parent
4f8db4f203
commit
982a2bb7e4
|
@ -4743,7 +4743,9 @@ S: Supported
|
|||
W: http://linux-cifs.samba.org/
|
||||
T: git git://git.samba.org/sfrench/cifs-2.6.git
|
||||
F: Documentation/admin-guide/cifs/
|
||||
F: fs/cifs/
|
||||
F: fs/smb/client
|
||||
F: fs/smb/common
|
||||
F: include/uapi/linux/cifs
|
||||
|
||||
COMPACTPCI HOTPLUG CORE
|
||||
M: Scott Murray <scott@spiteful.org>
|
||||
|
|
|
@ -363,12 +363,7 @@ config NFS_V4_2_SSC_HELPER
|
|||
source "net/sunrpc/Kconfig"
|
||||
source "fs/ceph/Kconfig"
|
||||
|
||||
source "fs/cifs/Kconfig"
|
||||
|
||||
config SMBFS_COMMON
|
||||
tristate
|
||||
default y if CIFS=y
|
||||
default m if CIFS=m
|
||||
source "fs/smb/Kconfig"
|
||||
|
||||
source "fs/coda/Kconfig"
|
||||
source "fs/afs/Kconfig"
|
||||
|
|
|
@ -90,8 +90,7 @@ obj-$(CONFIG_LOCKD) += lockd/
|
|||
obj-$(CONFIG_NLS) += nls/
|
||||
obj-$(CONFIG_UNICODE) += unicode/
|
||||
obj-$(CONFIG_SYSV_FS) += sysv/
|
||||
obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
|
||||
obj-$(CONFIG_CIFS) += cifs/
|
||||
obj-$(CONFIG_SMBFS) += smb/
|
||||
obj-$(CONFIG_HPFS_FS) += hpfs/
|
||||
obj-$(CONFIG_NTFS_FS) += ntfs/
|
||||
obj-$(CONFIG_UFS_FS) += ufs/
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
#
|
||||
# smbfs configuration
|
||||
|
||||
source "fs/smb/client/Kconfig"
|
||||
|
||||
config SMBFS
|
||||
tristate
|
||||
default y if CIFS=y
|
||||
default m if CIFS=m
|
|
@ -0,0 +1,4 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
obj-$(CONFIG_SMBFS) += common/
|
||||
obj-$(CONFIG_CIFS) += client/
|
|
@ -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>
|
||||
|
||||
int __cifs_calc_signature(struct smb_rqst *rqst,
|
|
@ -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"
|
||||
|
||||
#define SMB_PATH_MAX 260
|
|
@ -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)
|
|
@ -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
|
|
@ -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
|
|
@ -33,7 +33,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2
|
|||
|
||||
usbdrvs="atm image misc serial wusbcore"
|
||||
|
||||
fsdrvs="affs befs cifs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
|
||||
fsdrvs="affs befs smb coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
|
||||
|
||||
netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
|
||||
|
||||
|
|
Loading…
Reference in New Issue