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 <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
AsahiLinux · Sep 14, 2021 · b4a8c8f · b4a8c8f
1 parent 4c51de1
commit b4a8c8f
Show file tree

Hide file tree

Showing 81 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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 <server-ip> and <share> 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
@@ -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/
                                                                      <mailto:aherrman@de.ibm.com>

diff --git 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 <scott@spiteful.org>

diff --git 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
@@ -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 → fs/smbfs_client/Kconfig b/fs/cifs/Kconfig → fs/smbfs_client/Kconfig
diff --git a/fs/cifs/Makefile → fs/smbfs_client/Makefile b/fs/cifs/Makefile → fs/smbfs_client/Makefile
diff --git a/fs/cifs/asn1.c → fs/smbfs_client/asn1.c b/fs/cifs/asn1.c → fs/smbfs_client/asn1.c
diff --git a/fs/cifs/cache.c → fs/smbfs_client/cache.c b/fs/cifs/cache.c → fs/smbfs_client/cache.c
diff --git a/fs/cifs/cifs_debug.c → fs/smbfs_client/cifs_debug.c b/fs/cifs/cifs_debug.c → fs/smbfs_client/cifs_debug.c
diff --git a/fs/cifs/cifs_debug.h → fs/smbfs_client/cifs_debug.h b/fs/cifs/cifs_debug.h → fs/smbfs_client/cifs_debug.h
diff --git a/fs/cifs/cifs_dfs_ref.c → fs/smbfs_client/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c → fs/smbfs_client/cifs_dfs_ref.c
diff --git a/fs/cifs/cifs_fs_sb.h → fs/smbfs_client/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h → fs/smbfs_client/cifs_fs_sb.h
diff --git a/fs/cifs/cifs_ioctl.h → fs/smbfs_client/cifs_ioctl.h b/fs/cifs/cifs_ioctl.h → fs/smbfs_client/cifs_ioctl.h
diff --git a/fs/cifs/cifs_spnego.c → fs/smbfs_client/cifs_spnego.c b/fs/cifs/cifs_spnego.c → fs/smbfs_client/cifs_spnego.c
diff --git a/fs/cifs/cifs_spnego.h → fs/smbfs_client/cifs_spnego.h b/fs/cifs/cifs_spnego.h → fs/smbfs_client/cifs_spnego.h
diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 → ...mbfs_client/cifs_spnego_negtokeninit.asn1 b/fs/cifs/cifs_spnego_negtokeninit.asn1 → ...mbfs_client/cifs_spnego_negtokeninit.asn1
diff --git a/fs/cifs/cifs_swn.c → fs/smbfs_client/cifs_swn.c b/fs/cifs/cifs_swn.c → fs/smbfs_client/cifs_swn.c
diff --git a/fs/cifs/cifs_swn.h → fs/smbfs_client/cifs_swn.h b/fs/cifs/cifs_swn.h → fs/smbfs_client/cifs_swn.h
diff --git a/fs/cifs/cifs_unicode.c → fs/smbfs_client/cifs_unicode.c b/fs/cifs/cifs_unicode.c → fs/smbfs_client/cifs_unicode.c
diff --git a/fs/cifs/cifs_unicode.h → fs/smbfs_client/cifs_unicode.h b/fs/cifs/cifs_unicode.h → fs/smbfs_client/cifs_unicode.h
diff --git a/fs/cifs/cifs_uniupr.h → fs/smbfs_client/cifs_uniupr.h b/fs/cifs/cifs_uniupr.h → fs/smbfs_client/cifs_uniupr.h
diff --git a/fs/cifs/cifsacl.c → fs/smbfs_client/cifsacl.c b/fs/cifs/cifsacl.c → fs/smbfs_client/cifsacl.c
diff --git a/fs/cifs/cifsacl.h → fs/smbfs_client/cifsacl.h b/fs/cifs/cifsacl.h → fs/smbfs_client/cifsacl.h
diff --git a/fs/cifs/cifsencrypt.c → fs/smbfs_client/cifsencrypt.c b/fs/cifs/cifsencrypt.c → fs/smbfs_client/cifsencrypt.c
diff --git a/fs/cifs/cifsfs.c → fs/smbfs_client/cifsfs.c b/fs/cifs/cifsfs.c → fs/smbfs_client/cifsfs.c
diff --git a/fs/cifs/cifsfs.h → fs/smbfs_client/cifsfs.h b/fs/cifs/cifsfs.h → fs/smbfs_client/cifsfs.h
diff --git a/fs/cifs/cifsglob.h → fs/smbfs_client/cifsglob.h b/fs/cifs/cifsglob.h → fs/smbfs_client/cifsglob.h
diff --git a/fs/cifs/cifspdu.h → fs/smbfs_client/cifspdu.h b/fs/cifs/cifspdu.h → fs/smbfs_client/cifspdu.h
diff --git a/fs/cifs/cifsproto.h → fs/smbfs_client/cifsproto.h b/fs/cifs/cifsproto.h → fs/smbfs_client/cifsproto.h
diff --git a/fs/cifs/cifsroot.c → fs/smbfs_client/cifsroot.c b/fs/cifs/cifsroot.c → fs/smbfs_client/cifsroot.c
diff --git a/fs/cifs/cifssmb.c → fs/smbfs_client/cifssmb.c b/fs/cifs/cifssmb.c → fs/smbfs_client/cifssmb.c
diff --git a/fs/cifs/connect.c → fs/smbfs_client/connect.c b/fs/cifs/connect.c → fs/smbfs_client/connect.c
diff --git a/fs/cifs/dfs_cache.c → fs/smbfs_client/dfs_cache.c b/fs/cifs/dfs_cache.c → fs/smbfs_client/dfs_cache.c
diff --git a/fs/cifs/dfs_cache.h → fs/smbfs_client/dfs_cache.h b/fs/cifs/dfs_cache.h → fs/smbfs_client/dfs_cache.h
diff --git a/fs/cifs/dir.c → fs/smbfs_client/dir.c b/fs/cifs/dir.c → fs/smbfs_client/dir.c
diff --git a/fs/cifs/dns_resolve.c → fs/smbfs_client/dns_resolve.c b/fs/cifs/dns_resolve.c → fs/smbfs_client/dns_resolve.c
diff --git a/fs/cifs/dns_resolve.h → fs/smbfs_client/dns_resolve.h b/fs/cifs/dns_resolve.h → fs/smbfs_client/dns_resolve.h
diff --git a/fs/cifs/export.c → fs/smbfs_client/export.c b/fs/cifs/export.c → fs/smbfs_client/export.c
diff --git a/fs/cifs/file.c → fs/smbfs_client/file.c b/fs/cifs/file.c → fs/smbfs_client/file.c
diff --git a/fs/cifs/fs_context.c → fs/smbfs_client/fs_context.c b/fs/cifs/fs_context.c → fs/smbfs_client/fs_context.c
diff --git a/fs/cifs/fs_context.h → fs/smbfs_client/fs_context.h b/fs/cifs/fs_context.h → fs/smbfs_client/fs_context.h
diff --git a/fs/cifs/fscache.c → fs/smbfs_client/fscache.c b/fs/cifs/fscache.c → fs/smbfs_client/fscache.c
diff --git a/fs/cifs/fscache.h → fs/smbfs_client/fscache.h b/fs/cifs/fscache.h → fs/smbfs_client/fscache.h
diff --git a/fs/cifs/inode.c → fs/smbfs_client/inode.c b/fs/cifs/inode.c → fs/smbfs_client/inode.c
diff --git a/fs/cifs/ioctl.c → fs/smbfs_client/ioctl.c b/fs/cifs/ioctl.c → fs/smbfs_client/ioctl.c
diff --git a/fs/cifs/link.c → fs/smbfs_client/link.c b/fs/cifs/link.c → fs/smbfs_client/link.c
diff --git a/fs/cifs/misc.c → fs/smbfs_client/misc.c b/fs/cifs/misc.c → fs/smbfs_client/misc.c
diff --git a/fs/cifs/netlink.c → fs/smbfs_client/netlink.c b/fs/cifs/netlink.c → fs/smbfs_client/netlink.c
diff --git a/fs/cifs/netlink.h → fs/smbfs_client/netlink.h b/fs/cifs/netlink.h → fs/smbfs_client/netlink.h
diff --git a/fs/cifs/netmisc.c → fs/smbfs_client/netmisc.c b/fs/cifs/netmisc.c → fs/smbfs_client/netmisc.c
diff --git a/fs/cifs/nterr.c → fs/smbfs_client/nterr.c b/fs/cifs/nterr.c → fs/smbfs_client/nterr.c
diff --git a/fs/cifs/nterr.h → fs/smbfs_client/nterr.h b/fs/cifs/nterr.h → fs/smbfs_client/nterr.h
diff --git a/fs/cifs/ntlmssp.h → fs/smbfs_client/ntlmssp.h b/fs/cifs/ntlmssp.h → fs/smbfs_client/ntlmssp.h
diff --git a/fs/cifs/readdir.c → fs/smbfs_client/readdir.c b/fs/cifs/readdir.c → fs/smbfs_client/readdir.c
diff --git a/fs/cifs/rfc1002pdu.h → fs/smbfs_client/rfc1002pdu.h b/fs/cifs/rfc1002pdu.h → fs/smbfs_client/rfc1002pdu.h
diff --git a/fs/cifs/sess.c → fs/smbfs_client/sess.c b/fs/cifs/sess.c → fs/smbfs_client/sess.c
diff --git a/fs/cifs/smb1ops.c → fs/smbfs_client/smb1ops.c b/fs/cifs/smb1ops.c → fs/smbfs_client/smb1ops.c
diff --git a/fs/cifs/smb2file.c → fs/smbfs_client/smb2file.c b/fs/cifs/smb2file.c → fs/smbfs_client/smb2file.c
diff --git a/fs/cifs/smb2glob.h → fs/smbfs_client/smb2glob.h b/fs/cifs/smb2glob.h → fs/smbfs_client/smb2glob.h
diff --git a/fs/cifs/smb2inode.c → fs/smbfs_client/smb2inode.c b/fs/cifs/smb2inode.c → fs/smbfs_client/smb2inode.c
diff --git a/fs/cifs/smb2maperror.c → fs/smbfs_client/smb2maperror.c b/fs/cifs/smb2maperror.c → fs/smbfs_client/smb2maperror.c
diff --git a/fs/cifs/smb2misc.c → fs/smbfs_client/smb2misc.c b/fs/cifs/smb2misc.c → fs/smbfs_client/smb2misc.c
diff --git a/fs/cifs/smb2ops.c → fs/smbfs_client/smb2ops.c b/fs/cifs/smb2ops.c → fs/smbfs_client/smb2ops.c
diff --git a/fs/cifs/smb2pdu.c → fs/smbfs_client/smb2pdu.c b/fs/cifs/smb2pdu.c → fs/smbfs_client/smb2pdu.c
diff --git a/fs/cifs/smb2pdu.h → fs/smbfs_client/smb2pdu.h b/fs/cifs/smb2pdu.h → fs/smbfs_client/smb2pdu.h
diff --git a/fs/cifs/smb2proto.h → fs/smbfs_client/smb2proto.h b/fs/cifs/smb2proto.h → fs/smbfs_client/smb2proto.h
diff --git a/fs/cifs/smb2status.h → fs/smbfs_client/smb2status.h b/fs/cifs/smb2status.h → fs/smbfs_client/smb2status.h
diff --git a/fs/cifs/smb2transport.c → fs/smbfs_client/smb2transport.c b/fs/cifs/smb2transport.c → fs/smbfs_client/smb2transport.c
diff --git a/fs/cifs/smbdirect.c → fs/smbfs_client/smbdirect.c b/fs/cifs/smbdirect.c → fs/smbfs_client/smbdirect.c
diff --git a/fs/cifs/smbdirect.h → fs/smbfs_client/smbdirect.h b/fs/cifs/smbdirect.h → fs/smbfs_client/smbdirect.h
diff --git a/fs/cifs/smbencrypt.c → fs/smbfs_client/smbencrypt.c b/fs/cifs/smbencrypt.c → fs/smbfs_client/smbencrypt.c
diff --git a/fs/cifs/smberr.h → fs/smbfs_client/smberr.h b/fs/cifs/smberr.h → fs/smbfs_client/smberr.h
diff --git a/fs/cifs/trace.c → fs/smbfs_client/trace.c b/fs/cifs/trace.c → fs/smbfs_client/trace.c
diff --git a/fs/cifs/trace.h → fs/smbfs_client/trace.h b/fs/cifs/trace.h → fs/smbfs_client/trace.h
diff --git a/fs/cifs/transport.c → fs/smbfs_client/transport.c b/fs/cifs/transport.c → fs/smbfs_client/transport.c
diff --git a/fs/cifs/unc.c → fs/smbfs_client/unc.c b/fs/cifs/unc.c → fs/smbfs_client/unc.c
diff --git a/fs/cifs/winucase.c → fs/smbfs_client/winucase.c b/fs/cifs/winucase.c → fs/smbfs_client/winucase.c
diff --git a/fs/cifs/xattr.c → fs/smbfs_client/xattr.c b/fs/cifs/xattr.c → fs/smbfs_client/xattr.c