cifs: rename cifs_common to smbfs_common

smfrench · smfrench · commit 23e91d8b7c5a · 2021-09-08T23:59:26.000-05:00
As we move to common code between client and server, we have
been asked to make the names less confusing, and refer less
to "cifs" and more to words which include "smb" instead to
e.g. "smbfs" for the client (we already have "ksmbd" for the
kernel server, and "smbd" for the user space Samba daemon).
So to be more consistent in the naming of common code between
client and server and reduce the risk of merge conflicts as
more common code is added - rename "cifs_common" to
"smbfs_common" (in future releases we also will rename
the fs/cifs directory to fs/smbfs)

Reviewed-by: Ronnie Sahlberg &lt;lsahlber@redhat.com&gt;
Signed-off-by: Steve French &lt;stfrench@microsoft.com&gt;
diff --git a/fs/Kconfig b/fs/Kconfig
@@ -352,7 +352,7 @@ source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
 source "fs/ksmbd/Kconfig"
 
-config CIFS_COMMON
+config SMBFS_COMMON
 	tristate
 	default y if CIFS=y
 	default m if CIFS=m
diff --git a/fs/Makefile b/fs/Makefile
@@ -96,7 +96,7 @@ obj-$(CONFIG_LOCKD)		+= lockd/
 obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_UNICODE)		+= unicode/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
-obj-$(CONFIG_CIFS_COMMON)	+= cifs_common/
+obj-$(CONFIG_SMBFS_COMMON)	+= smbfs_common/
 obj-$(CONFIG_CIFS)		+= cifs/
 obj-$(CONFIG_SMB_SERVER)	+= ksmbd/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
@@ -22,7 +22,7 @@
 #include <linux/random.h>
 #include <linux/highmem.h>
 #include <linux/fips.h>
-#include "../cifs_common/arc4.h"
+#include "../smbfs_common/arc4.h"
 #include <crypto/aead.h>
 
 int __cifs_calc_signature(struct smb_rqst *rqst,
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
@@ -24,7 +24,7 @@
 #include "cifsglob.h"
 #include "cifs_debug.h"
 #include "cifsproto.h"
-#include "../cifs_common/md4.h"
+#include "../smbfs_common/md4.h"
 
 #ifndef false
 #define false 0
diff --git a/fs/smbfs_common/Makefile b/fs/smbfs_common/Makefile
@@ -3,5 +3,5 @@
 # Makefile for Linux filesystem routines that are shared by client and server.
 #
 
-obj-$(CONFIG_CIFS_COMMON) += cifs_arc4.o
-obj-$(CONFIG_CIFS_COMMON) += cifs_md4.o
+obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o
+obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o
diff --git a/fs/smbfs_common/arc4.h b/fs/smbfs_common/arc4.h
diff --git a/fs/smbfs_common/cifs_arc4.c b/fs/smbfs_common/cifs_arc4.c
@@ -74,14 +74,14 @@ void cifs_arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, unsigned int l
 EXPORT_SYMBOL_GPL(cifs_arc4_crypt);
 
 static int __init
-init_cifs_common(void)
+init_smbfs_common(void)
 {
 	return 0;
 }
 static void __init
-exit_cifs_common(void)
+exit_smbfs_common(void)
 {
 }
 
-module_init(init_cifs_common)
-module_exit(exit_cifs_common)
+module_init(init_smbfs_common)
+module_exit(exit_smbfs_common)
diff --git a/fs/smbfs_common/cifs_md4.c b/fs/smbfs_common/cifs_md4.c
diff --git a/fs/smbfs_common/md4.h b/fs/smbfs_common/md4.h

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`# Makefile for Linux filesystem routines that are shared by client and server.`
`4`	`4`	`#`
`5`	`5`
`6`		`-obj-$(CONFIG_CIFS_COMMON) += cifs_arc4.o`
`7`		`-obj-$(CONFIG_CIFS_COMMON) += cifs_md4.o`
	`6`	`+obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o`
	`7`	`+obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o`
Original file line number	Diff line number	Diff line change
`@@ -74,14 +74,14 @@ void cifs_arc4_crypt(struct arc4_ctx ctx, u8 out, const u8 *in, unsigned int l`
`74`	`74`	`EXPORT_SYMBOL_GPL(cifs_arc4_crypt);`
`75`	`75`
`76`	`76`	`static int __init`
`77`		`-init_cifs_common(void)`
	`77`	`+init_smbfs_common(void)`
`78`	`78`	`{`
`79`	`79`	`return 0;`
`80`	`80`	`}`
`81`	`81`	`static void __init`
`82`		`-exit_cifs_common(void)`
	`82`	`+exit_smbfs_common(void)`
`83`	`83`	`{`
`84`	`84`	`}`
`85`	`85`
`86`		`-module_init(init_cifs_common)`
`87`		`-module_exit(exit_cifs_common)`
	`86`	`+module_init(init_smbfs_common)`
	`87`	`+module_exit(exit_smbfs_common)`