From b4a8c8f8fa8b7b86bb62257fbb27e7bde58ac97e Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 14 Sep 2021 00:05:24 -0500 Subject: [PATCH] cifs: rename fs/cifs directory to fs/smbfs_client To be more consistent with the source directory name for the new smb3 server (ksmbd), and to avoid using the word "cifs" (a very old dialect) when more recent dialects (like SMB3 or SMB3.1.1) are meant, rename the client directory from fs/cifs to fs/smbfs_client. It is already possible to do "modprobe smb3" or "mount -t smb3 ..." Note that this does not rename the module itself (cifs.ko) although that could be done in a future patch. Reviewed-by: Ronnie Sahlberg Signed-off-by: Steve French --- Documentation/admin-guide/cifs/changes.rst | 2 +- Documentation/admin-guide/cifs/usage.rst | 14 +++++++------- Documentation/filesystems/cifs/cifsroot.rst | 2 +- Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +- MAINTAINERS | 4 ++-- fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/{cifs => smbfs_client}/Kconfig | 0 fs/{cifs => smbfs_client}/Makefile | 0 fs/{cifs => smbfs_client}/asn1.c | 0 fs/{cifs => smbfs_client}/cache.c | 0 fs/{cifs => smbfs_client}/cifs_debug.c | 0 fs/{cifs => smbfs_client}/cifs_debug.h | 0 fs/{cifs => smbfs_client}/cifs_dfs_ref.c | 0 fs/{cifs => smbfs_client}/cifs_fs_sb.h | 0 fs/{cifs => smbfs_client}/cifs_ioctl.h | 0 fs/{cifs => smbfs_client}/cifs_spnego.c | 0 fs/{cifs => smbfs_client}/cifs_spnego.h | 0 .../cifs_spnego_negtokeninit.asn1 | 0 fs/{cifs => smbfs_client}/cifs_swn.c | 0 fs/{cifs => smbfs_client}/cifs_swn.h | 0 fs/{cifs => smbfs_client}/cifs_unicode.c | 0 fs/{cifs => smbfs_client}/cifs_unicode.h | 0 fs/{cifs => smbfs_client}/cifs_uniupr.h | 0 fs/{cifs => smbfs_client}/cifsacl.c | 0 fs/{cifs => smbfs_client}/cifsacl.h | 0 fs/{cifs => smbfs_client}/cifsencrypt.c | 0 fs/{cifs => smbfs_client}/cifsfs.c | 0 fs/{cifs => smbfs_client}/cifsfs.h | 0 fs/{cifs => smbfs_client}/cifsglob.h | 0 fs/{cifs => smbfs_client}/cifspdu.h | 0 fs/{cifs => smbfs_client}/cifsproto.h | 0 fs/{cifs => smbfs_client}/cifsroot.c | 0 fs/{cifs => smbfs_client}/cifssmb.c | 0 fs/{cifs => smbfs_client}/connect.c | 0 fs/{cifs => smbfs_client}/dfs_cache.c | 0 fs/{cifs => smbfs_client}/dfs_cache.h | 0 fs/{cifs => smbfs_client}/dir.c | 0 fs/{cifs => smbfs_client}/dns_resolve.c | 0 fs/{cifs => smbfs_client}/dns_resolve.h | 0 fs/{cifs => smbfs_client}/export.c | 0 fs/{cifs => smbfs_client}/file.c | 0 fs/{cifs => smbfs_client}/fs_context.c | 0 fs/{cifs => smbfs_client}/fs_context.h | 0 fs/{cifs => smbfs_client}/fscache.c | 0 fs/{cifs => smbfs_client}/fscache.h | 0 fs/{cifs => smbfs_client}/inode.c | 0 fs/{cifs => smbfs_client}/ioctl.c | 0 fs/{cifs => smbfs_client}/link.c | 0 fs/{cifs => smbfs_client}/misc.c | 0 fs/{cifs => smbfs_client}/netlink.c | 0 fs/{cifs => smbfs_client}/netlink.h | 0 fs/{cifs => smbfs_client}/netmisc.c | 0 fs/{cifs => smbfs_client}/nterr.c | 0 fs/{cifs => smbfs_client}/nterr.h | 0 fs/{cifs => smbfs_client}/ntlmssp.h | 0 fs/{cifs => smbfs_client}/readdir.c | 0 fs/{cifs => smbfs_client}/rfc1002pdu.h | 0 fs/{cifs => smbfs_client}/sess.c | 0 fs/{cifs => smbfs_client}/smb1ops.c | 0 fs/{cifs => smbfs_client}/smb2file.c | 0 fs/{cifs => smbfs_client}/smb2glob.h | 0 fs/{cifs => smbfs_client}/smb2inode.c | 0 fs/{cifs => smbfs_client}/smb2maperror.c | 0 fs/{cifs => smbfs_client}/smb2misc.c | 0 fs/{cifs => smbfs_client}/smb2ops.c | 0 fs/{cifs => smbfs_client}/smb2pdu.c | 0 fs/{cifs => smbfs_client}/smb2pdu.h | 0 fs/{cifs => smbfs_client}/smb2proto.h | 0 fs/{cifs => smbfs_client}/smb2status.h | 0 fs/{cifs => smbfs_client}/smb2transport.c | 0 fs/{cifs => smbfs_client}/smbdirect.c | 0 fs/{cifs => smbfs_client}/smbdirect.h | 0 fs/{cifs => smbfs_client}/smbencrypt.c | 0 fs/{cifs => smbfs_client}/smberr.h | 0 fs/{cifs => smbfs_client}/trace.c | 0 fs/{cifs => smbfs_client}/trace.h | 0 fs/{cifs => smbfs_client}/transport.c | 0 fs/{cifs => smbfs_client}/unc.c | 0 fs/{cifs => smbfs_client}/winucase.c | 0 fs/{cifs => smbfs_client}/xattr.c | 0 81 files changed, 14 insertions(+), 14 deletions(-) rename fs/{cifs => smbfs_client}/Kconfig (100%) rename fs/{cifs => smbfs_client}/Makefile (100%) rename fs/{cifs => smbfs_client}/asn1.c (100%) rename fs/{cifs => smbfs_client}/cache.c (100%) rename fs/{cifs => smbfs_client}/cifs_debug.c (100%) rename fs/{cifs => smbfs_client}/cifs_debug.h (100%) rename fs/{cifs => smbfs_client}/cifs_dfs_ref.c (100%) rename fs/{cifs => smbfs_client}/cifs_fs_sb.h (100%) rename fs/{cifs => smbfs_client}/cifs_ioctl.h (100%) rename fs/{cifs => smbfs_client}/cifs_spnego.c (100%) rename fs/{cifs => smbfs_client}/cifs_spnego.h (100%) rename fs/{cifs => smbfs_client}/cifs_spnego_negtokeninit.asn1 (100%) rename fs/{cifs => smbfs_client}/cifs_swn.c (100%) rename fs/{cifs => smbfs_client}/cifs_swn.h (100%) rename fs/{cifs => smbfs_client}/cifs_unicode.c (100%) rename fs/{cifs => smbfs_client}/cifs_unicode.h (100%) rename fs/{cifs => smbfs_client}/cifs_uniupr.h (100%) rename fs/{cifs => smbfs_client}/cifsacl.c (100%) rename fs/{cifs => smbfs_client}/cifsacl.h (100%) rename fs/{cifs => smbfs_client}/cifsencrypt.c (100%) rename fs/{cifs => smbfs_client}/cifsfs.c (100%) rename fs/{cifs => smbfs_client}/cifsfs.h (100%) rename fs/{cifs => smbfs_client}/cifsglob.h (100%) rename fs/{cifs => smbfs_client}/cifspdu.h (100%) rename fs/{cifs => smbfs_client}/cifsproto.h (100%) rename fs/{cifs => smbfs_client}/cifsroot.c (100%) rename fs/{cifs => smbfs_client}/cifssmb.c (100%) rename fs/{cifs => smbfs_client}/connect.c (100%) rename fs/{cifs => smbfs_client}/dfs_cache.c (100%) rename fs/{cifs => smbfs_client}/dfs_cache.h (100%) rename fs/{cifs => smbfs_client}/dir.c (100%) rename fs/{cifs => smbfs_client}/dns_resolve.c (100%) rename fs/{cifs => smbfs_client}/dns_resolve.h (100%) rename fs/{cifs => smbfs_client}/export.c (100%) rename fs/{cifs => smbfs_client}/file.c (100%) rename fs/{cifs => smbfs_client}/fs_context.c (100%) rename fs/{cifs => smbfs_client}/fs_context.h (100%) rename fs/{cifs => smbfs_client}/fscache.c (100%) rename fs/{cifs => smbfs_client}/fscache.h (100%) rename fs/{cifs => smbfs_client}/inode.c (100%) rename fs/{cifs => smbfs_client}/ioctl.c (100%) rename fs/{cifs => smbfs_client}/link.c (100%) rename fs/{cifs => smbfs_client}/misc.c (100%) rename fs/{cifs => smbfs_client}/netlink.c (100%) rename fs/{cifs => smbfs_client}/netlink.h (100%) rename fs/{cifs => smbfs_client}/netmisc.c (100%) rename fs/{cifs => smbfs_client}/nterr.c (100%) rename fs/{cifs => smbfs_client}/nterr.h (100%) rename fs/{cifs => smbfs_client}/ntlmssp.h (100%) rename fs/{cifs => smbfs_client}/readdir.c (100%) rename fs/{cifs => smbfs_client}/rfc1002pdu.h (100%) rename fs/{cifs => smbfs_client}/sess.c (100%) rename fs/{cifs => smbfs_client}/smb1ops.c (100%) rename fs/{cifs => smbfs_client}/smb2file.c (100%) rename fs/{cifs => smbfs_client}/smb2glob.h (100%) rename fs/{cifs => smbfs_client}/smb2inode.c (100%) rename fs/{cifs => smbfs_client}/smb2maperror.c (100%) rename fs/{cifs => smbfs_client}/smb2misc.c (100%) rename fs/{cifs => smbfs_client}/smb2ops.c (100%) rename fs/{cifs => smbfs_client}/smb2pdu.c (100%) rename fs/{cifs => smbfs_client}/smb2pdu.h (100%) rename fs/{cifs => smbfs_client}/smb2proto.h (100%) rename fs/{cifs => smbfs_client}/smb2status.h (100%) rename fs/{cifs => smbfs_client}/smb2transport.c (100%) rename fs/{cifs => smbfs_client}/smbdirect.c (100%) rename fs/{cifs => smbfs_client}/smbdirect.h (100%) rename fs/{cifs => smbfs_client}/smbencrypt.c (100%) rename fs/{cifs => smbfs_client}/smberr.h (100%) rename fs/{cifs => smbfs_client}/trace.c (100%) rename fs/{cifs => smbfs_client}/trace.h (100%) rename fs/{cifs => smbfs_client}/transport.c (100%) rename fs/{cifs => smbfs_client}/unc.c (100%) rename fs/{cifs => smbfs_client}/winucase.c (100%) rename fs/{cifs => smbfs_client}/xattr.c (100%) diff --git a/Documentation/admin-guide/cifs/changes.rst b/Documentation/admin-guide/cifs/changes.rst index 3147bbae9c43..ea4d9269237c 100644 --- a/Documentation/admin-guide/cifs/changes.rst +++ b/Documentation/admin-guide/cifs/changes.rst @@ -5,5 +5,5 @@ Changes See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary information about fixes/improvements to CIFS/SMB2/SMB3 support (changes to cifs.ko module) by kernel version (and cifs internal module version). -This may be easier to read than parsing the output of "git log fs/cifs" +This may be easier to read than parsing the output of "git log fs/smbfs_client" by release. diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst index f170d8820258..7b096a7823d2 100644 --- a/Documentation/admin-guide/cifs/usage.rst +++ b/Documentation/admin-guide/cifs/usage.rst @@ -45,7 +45,7 @@ Installation instructions If you have built the CIFS vfs as module (successfully) simply type ``make modules_install`` (or if you prefer, manually copy the file to -the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko). +the modules directory e.g. /lib/modules/5.10.0+/kernel/fs/smbfs_client/cifs.ko). If you have built the CIFS vfs into the kernel itself, follow the instructions for your distribution on how to install a new kernel (usually you @@ -66,22 +66,22 @@ If cifs is built as a module, then the size and number of network buffers and maximum number of simultaneous requests to one server can be configured. Changing these from their defaults is not recommended. By executing modinfo:: - modinfo kernel/fs/cifs/cifs.ko + modinfo kernel/fs/smbfs_client/cifs.ko -on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made -at module initialization time (by running insmod cifs.ko) can be seen. +on kernel/fs/smbfs_client/cifs.ko the list of configuration changes that can be +made at module initialization time (by running insmod cifs.ko) can be seen. Recommendations =============== -To improve security the SMB2.1 dialect or later (usually will get SMB3) is now -the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0" +To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is +now the default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0" on mount (or vers=2.0 for Windows Vista). Note that the CIFS (vers=1.0) is much older and less secure than the default dialect SMB3 which includes many advanced security features such as downgrade attack detection and encrypted shares and stronger signing and authentication algorithms. There are additional mount options that may be helpful for SMB3 to get -improved POSIX behavior (NB: can use vers=3.0 to force only SMB3, never 2.1): +improved POSIX behavior (NB: can use vers=3 to force only SMB3, never 2.1): ``mfsymlinks`` and either ``cifsacl`` or ``modefromsid`` (usually with ``idsfromsid``) diff --git a/Documentation/filesystems/cifs/cifsroot.rst b/Documentation/filesystems/cifs/cifsroot.rst index 4930bb443134..b1329d1a6f25 100644 --- a/Documentation/filesystems/cifs/cifsroot.rst +++ b/Documentation/filesystems/cifs/cifsroot.rst @@ -59,7 +59,7 @@ the root file system via SMB protocol. Enables the kernel to mount the root file system via SMB that are located in the and specified in this option. -The default mount options are set in fs/cifs/cifsroot.c. +The default mount options are set in fs/smbfs_client/cifsroot.c. server-ip IPv4 address of the server. diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst index 2e8134059c87..2dc93cab0d30 100644 --- a/Documentation/userspace-api/ioctl/ioctl-number.rst +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst @@ -359,7 +359,7 @@ Code Seq# Include File Comments 0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver 0xCD 01 linux/reiserfs_fs.h 0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices -0xCF 02 fs/cifs/ioctl.c +0xCF 02 fs/smbfs_client/ioctl.c 0xDB 00-0F drivers/char/mwave/mwavepub.h 0xDD 00-3F ZFCP device driver see drivers/s390/scsi/ diff --git a/MAINTAINERS b/MAINTAINERS index eeb4c70b3d5b..8f5bee177496 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4655,8 +4655,8 @@ 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/cifs_common/ +F: fs/smbfs_client/ +F: fs/smbfs_common/ COMPACTPCI HOTPLUG CORE M: Scott Murray diff --git a/fs/Kconfig b/fs/Kconfig index a6313a969bc5..847d81b200ee 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -364,7 +364,7 @@ config NFS_V4_2_SSC_HELPER source "net/sunrpc/Kconfig" source "fs/ceph/Kconfig" -source "fs/cifs/Kconfig" +source "fs/smbfs_client/Kconfig" source "fs/ksmbd/Kconfig" config SMBFS_COMMON diff --git a/fs/Makefile b/fs/Makefile index 84c5e4cdfee5..67362a7e5b84 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -97,7 +97,7 @@ 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_CIFS) += smbfs_client/ obj-$(CONFIG_SMB_SERVER) += ksmbd/ obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_NTFS_FS) += ntfs/ diff --git a/fs/cifs/Kconfig b/fs/smbfs_client/Kconfig similarity index 100% rename from fs/cifs/Kconfig rename to fs/smbfs_client/Kconfig diff --git a/fs/cifs/Makefile b/fs/smbfs_client/Makefile similarity index 100% rename from fs/cifs/Makefile rename to fs/smbfs_client/Makefile diff --git a/fs/cifs/asn1.c b/fs/smbfs_client/asn1.c similarity index 100% rename from fs/cifs/asn1.c rename to fs/smbfs_client/asn1.c diff --git a/fs/cifs/cache.c b/fs/smbfs_client/cache.c similarity index 100% rename from fs/cifs/cache.c rename to fs/smbfs_client/cache.c diff --git a/fs/cifs/cifs_debug.c b/fs/smbfs_client/cifs_debug.c similarity index 100% rename from fs/cifs/cifs_debug.c rename to fs/smbfs_client/cifs_debug.c diff --git a/fs/cifs/cifs_debug.h b/fs/smbfs_client/cifs_debug.h similarity index 100% rename from fs/cifs/cifs_debug.h rename to fs/smbfs_client/cifs_debug.h diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smbfs_client/cifs_dfs_ref.c similarity index 100% rename from fs/cifs/cifs_dfs_ref.c rename to fs/smbfs_client/cifs_dfs_ref.c diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smbfs_client/cifs_fs_sb.h similarity index 100% rename from fs/cifs/cifs_fs_sb.h rename to fs/smbfs_client/cifs_fs_sb.h diff --git a/fs/cifs/cifs_ioctl.h b/fs/smbfs_client/cifs_ioctl.h similarity index 100% rename from fs/cifs/cifs_ioctl.h rename to fs/smbfs_client/cifs_ioctl.h diff --git a/fs/cifs/cifs_spnego.c b/fs/smbfs_client/cifs_spnego.c similarity index 100% rename from fs/cifs/cifs_spnego.c rename to fs/smbfs_client/cifs_spnego.c diff --git a/fs/cifs/cifs_spnego.h b/fs/smbfs_client/cifs_spnego.h similarity index 100% rename from fs/cifs/cifs_spnego.h rename to fs/smbfs_client/cifs_spnego.h diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smbfs_client/cifs_spnego_negtokeninit.asn1 similarity index 100% rename from fs/cifs/cifs_spnego_negtokeninit.asn1 rename to fs/smbfs_client/cifs_spnego_negtokeninit.asn1 diff --git a/fs/cifs/cifs_swn.c b/fs/smbfs_client/cifs_swn.c similarity index 100% rename from fs/cifs/cifs_swn.c rename to fs/smbfs_client/cifs_swn.c diff --git a/fs/cifs/cifs_swn.h b/fs/smbfs_client/cifs_swn.h similarity index 100% rename from fs/cifs/cifs_swn.h rename to fs/smbfs_client/cifs_swn.h diff --git a/fs/cifs/cifs_unicode.c b/fs/smbfs_client/cifs_unicode.c similarity index 100% rename from fs/cifs/cifs_unicode.c rename to fs/smbfs_client/cifs_unicode.c diff --git a/fs/cifs/cifs_unicode.h b/fs/smbfs_client/cifs_unicode.h similarity index 100% rename from fs/cifs/cifs_unicode.h rename to fs/smbfs_client/cifs_unicode.h diff --git a/fs/cifs/cifs_uniupr.h b/fs/smbfs_client/cifs_uniupr.h similarity index 100% rename from fs/cifs/cifs_uniupr.h rename to fs/smbfs_client/cifs_uniupr.h diff --git a/fs/cifs/cifsacl.c b/fs/smbfs_client/cifsacl.c similarity index 100% rename from fs/cifs/cifsacl.c rename to fs/smbfs_client/cifsacl.c diff --git a/fs/cifs/cifsacl.h b/fs/smbfs_client/cifsacl.h similarity index 100% rename from fs/cifs/cifsacl.h rename to fs/smbfs_client/cifsacl.h diff --git a/fs/cifs/cifsencrypt.c b/fs/smbfs_client/cifsencrypt.c similarity index 100% rename from fs/cifs/cifsencrypt.c rename to fs/smbfs_client/cifsencrypt.c diff --git a/fs/cifs/cifsfs.c b/fs/smbfs_client/cifsfs.c similarity index 100% rename from fs/cifs/cifsfs.c rename to fs/smbfs_client/cifsfs.c diff --git a/fs/cifs/cifsfs.h b/fs/smbfs_client/cifsfs.h similarity index 100% rename from fs/cifs/cifsfs.h rename to fs/smbfs_client/cifsfs.h diff --git a/fs/cifs/cifsglob.h b/fs/smbfs_client/cifsglob.h similarity index 100% rename from fs/cifs/cifsglob.h rename to fs/smbfs_client/cifsglob.h diff --git a/fs/cifs/cifspdu.h b/fs/smbfs_client/cifspdu.h similarity index 100% rename from fs/cifs/cifspdu.h rename to fs/smbfs_client/cifspdu.h diff --git a/fs/cifs/cifsproto.h b/fs/smbfs_client/cifsproto.h similarity index 100% rename from fs/cifs/cifsproto.h rename to fs/smbfs_client/cifsproto.h diff --git a/fs/cifs/cifsroot.c b/fs/smbfs_client/cifsroot.c similarity index 100% rename from fs/cifs/cifsroot.c rename to fs/smbfs_client/cifsroot.c diff --git a/fs/cifs/cifssmb.c b/fs/smbfs_client/cifssmb.c similarity index 100% rename from fs/cifs/cifssmb.c rename to fs/smbfs_client/cifssmb.c diff --git a/fs/cifs/connect.c b/fs/smbfs_client/connect.c similarity index 100% rename from fs/cifs/connect.c rename to fs/smbfs_client/connect.c diff --git a/fs/cifs/dfs_cache.c b/fs/smbfs_client/dfs_cache.c similarity index 100% rename from fs/cifs/dfs_cache.c rename to fs/smbfs_client/dfs_cache.c diff --git a/fs/cifs/dfs_cache.h b/fs/smbfs_client/dfs_cache.h similarity index 100% rename from fs/cifs/dfs_cache.h rename to fs/smbfs_client/dfs_cache.h diff --git a/fs/cifs/dir.c b/fs/smbfs_client/dir.c similarity index 100% rename from fs/cifs/dir.c rename to fs/smbfs_client/dir.c diff --git a/fs/cifs/dns_resolve.c b/fs/smbfs_client/dns_resolve.c similarity index 100% rename from fs/cifs/dns_resolve.c rename to fs/smbfs_client/dns_resolve.c diff --git a/fs/cifs/dns_resolve.h b/fs/smbfs_client/dns_resolve.h similarity index 100% rename from fs/cifs/dns_resolve.h rename to fs/smbfs_client/dns_resolve.h diff --git a/fs/cifs/export.c b/fs/smbfs_client/export.c similarity index 100% rename from fs/cifs/export.c rename to fs/smbfs_client/export.c diff --git a/fs/cifs/file.c b/fs/smbfs_client/file.c similarity index 100% rename from fs/cifs/file.c rename to fs/smbfs_client/file.c diff --git a/fs/cifs/fs_context.c b/fs/smbfs_client/fs_context.c similarity index 100% rename from fs/cifs/fs_context.c rename to fs/smbfs_client/fs_context.c diff --git a/fs/cifs/fs_context.h b/fs/smbfs_client/fs_context.h similarity index 100% rename from fs/cifs/fs_context.h rename to fs/smbfs_client/fs_context.h diff --git a/fs/cifs/fscache.c b/fs/smbfs_client/fscache.c similarity index 100% rename from fs/cifs/fscache.c rename to fs/smbfs_client/fscache.c diff --git a/fs/cifs/fscache.h b/fs/smbfs_client/fscache.h similarity index 100% rename from fs/cifs/fscache.h rename to fs/smbfs_client/fscache.h diff --git a/fs/cifs/inode.c b/fs/smbfs_client/inode.c similarity index 100% rename from fs/cifs/inode.c rename to fs/smbfs_client/inode.c diff --git a/fs/cifs/ioctl.c b/fs/smbfs_client/ioctl.c similarity index 100% rename from fs/cifs/ioctl.c rename to fs/smbfs_client/ioctl.c diff --git a/fs/cifs/link.c b/fs/smbfs_client/link.c similarity index 100% rename from fs/cifs/link.c rename to fs/smbfs_client/link.c diff --git a/fs/cifs/misc.c b/fs/smbfs_client/misc.c similarity index 100% rename from fs/cifs/misc.c rename to fs/smbfs_client/misc.c diff --git a/fs/cifs/netlink.c b/fs/smbfs_client/netlink.c similarity index 100% rename from fs/cifs/netlink.c rename to fs/smbfs_client/netlink.c diff --git a/fs/cifs/netlink.h b/fs/smbfs_client/netlink.h similarity index 100% rename from fs/cifs/netlink.h rename to fs/smbfs_client/netlink.h diff --git a/fs/cifs/netmisc.c b/fs/smbfs_client/netmisc.c similarity index 100% rename from fs/cifs/netmisc.c rename to fs/smbfs_client/netmisc.c diff --git a/fs/cifs/nterr.c b/fs/smbfs_client/nterr.c similarity index 100% rename from fs/cifs/nterr.c rename to fs/smbfs_client/nterr.c diff --git a/fs/cifs/nterr.h b/fs/smbfs_client/nterr.h similarity index 100% rename from fs/cifs/nterr.h rename to fs/smbfs_client/nterr.h diff --git a/fs/cifs/ntlmssp.h b/fs/smbfs_client/ntlmssp.h similarity index 100% rename from fs/cifs/ntlmssp.h rename to fs/smbfs_client/ntlmssp.h diff --git a/fs/cifs/readdir.c b/fs/smbfs_client/readdir.c similarity index 100% rename from fs/cifs/readdir.c rename to fs/smbfs_client/readdir.c diff --git a/fs/cifs/rfc1002pdu.h b/fs/smbfs_client/rfc1002pdu.h similarity index 100% rename from fs/cifs/rfc1002pdu.h rename to fs/smbfs_client/rfc1002pdu.h diff --git a/fs/cifs/sess.c b/fs/smbfs_client/sess.c similarity index 100% rename from fs/cifs/sess.c rename to fs/smbfs_client/sess.c diff --git a/fs/cifs/smb1ops.c b/fs/smbfs_client/smb1ops.c similarity index 100% rename from fs/cifs/smb1ops.c rename to fs/smbfs_client/smb1ops.c diff --git a/fs/cifs/smb2file.c b/fs/smbfs_client/smb2file.c similarity index 100% rename from fs/cifs/smb2file.c rename to fs/smbfs_client/smb2file.c diff --git a/fs/cifs/smb2glob.h b/fs/smbfs_client/smb2glob.h similarity index 100% rename from fs/cifs/smb2glob.h rename to fs/smbfs_client/smb2glob.h diff --git a/fs/cifs/smb2inode.c b/fs/smbfs_client/smb2inode.c similarity index 100% rename from fs/cifs/smb2inode.c rename to fs/smbfs_client/smb2inode.c diff --git a/fs/cifs/smb2maperror.c b/fs/smbfs_client/smb2maperror.c similarity index 100% rename from fs/cifs/smb2maperror.c rename to fs/smbfs_client/smb2maperror.c diff --git a/fs/cifs/smb2misc.c b/fs/smbfs_client/smb2misc.c similarity index 100% rename from fs/cifs/smb2misc.c rename to fs/smbfs_client/smb2misc.c diff --git a/fs/cifs/smb2ops.c b/fs/smbfs_client/smb2ops.c similarity index 100% rename from fs/cifs/smb2ops.c rename to fs/smbfs_client/smb2ops.c diff --git a/fs/cifs/smb2pdu.c b/fs/smbfs_client/smb2pdu.c similarity index 100% rename from fs/cifs/smb2pdu.c rename to fs/smbfs_client/smb2pdu.c diff --git a/fs/cifs/smb2pdu.h b/fs/smbfs_client/smb2pdu.h similarity index 100% rename from fs/cifs/smb2pdu.h rename to fs/smbfs_client/smb2pdu.h diff --git a/fs/cifs/smb2proto.h b/fs/smbfs_client/smb2proto.h similarity index 100% rename from fs/cifs/smb2proto.h rename to fs/smbfs_client/smb2proto.h diff --git a/fs/cifs/smb2status.h b/fs/smbfs_client/smb2status.h similarity index 100% rename from fs/cifs/smb2status.h rename to fs/smbfs_client/smb2status.h diff --git a/fs/cifs/smb2transport.c b/fs/smbfs_client/smb2transport.c similarity index 100% rename from fs/cifs/smb2transport.c rename to fs/smbfs_client/smb2transport.c diff --git a/fs/cifs/smbdirect.c b/fs/smbfs_client/smbdirect.c similarity index 100% rename from fs/cifs/smbdirect.c rename to fs/smbfs_client/smbdirect.c diff --git a/fs/cifs/smbdirect.h b/fs/smbfs_client/smbdirect.h similarity index 100% rename from fs/cifs/smbdirect.h rename to fs/smbfs_client/smbdirect.h diff --git a/fs/cifs/smbencrypt.c b/fs/smbfs_client/smbencrypt.c similarity index 100% rename from fs/cifs/smbencrypt.c rename to fs/smbfs_client/smbencrypt.c diff --git a/fs/cifs/smberr.h b/fs/smbfs_client/smberr.h similarity index 100% rename from fs/cifs/smberr.h rename to fs/smbfs_client/smberr.h diff --git a/fs/cifs/trace.c b/fs/smbfs_client/trace.c similarity index 100% rename from fs/cifs/trace.c rename to fs/smbfs_client/trace.c diff --git a/fs/cifs/trace.h b/fs/smbfs_client/trace.h similarity index 100% rename from fs/cifs/trace.h rename to fs/smbfs_client/trace.h diff --git a/fs/cifs/transport.c b/fs/smbfs_client/transport.c similarity index 100% rename from fs/cifs/transport.c rename to fs/smbfs_client/transport.c diff --git a/fs/cifs/unc.c b/fs/smbfs_client/unc.c similarity index 100% rename from fs/cifs/unc.c rename to fs/smbfs_client/unc.c diff --git a/fs/cifs/winucase.c b/fs/smbfs_client/winucase.c similarity index 100% rename from fs/cifs/winucase.c rename to fs/smbfs_client/winucase.c diff --git a/fs/cifs/xattr.c b/fs/smbfs_client/xattr.c similarity index 100% rename from fs/cifs/xattr.c rename to fs/smbfs_client/xattr.c -- 2.30.2