From 23e91d8b7c5ae2bbd3a4582ec12c6a0cfcb19e85 Mon Sep 17 00:00:00 2001 From: Steve French Date: Wed, 8 Sep 2021 23:59:26 -0500 Subject: [PATCH] cifs: rename cifs_common to smbfs_common 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 Signed-off-by: Steve French --- fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/smbencrypt.c | 2 +- fs/{cifs_common => smbfs_common}/Makefile | 4 ++-- fs/{cifs_common => smbfs_common}/arc4.h | 0 fs/{cifs_common => smbfs_common}/cifs_arc4.c | 8 ++++---- fs/{cifs_common => smbfs_common}/cifs_md4.c | 0 fs/{cifs_common => smbfs_common}/md4.h | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename fs/{cifs_common => smbfs_common}/Makefile (59%) rename fs/{cifs_common => smbfs_common}/arc4.h (100%) rename fs/{cifs_common => smbfs_common}/cifs_arc4.c (91%) rename fs/{cifs_common => smbfs_common}/cifs_md4.c (100%) rename fs/{cifs_common => smbfs_common}/md4.h (100%) diff --git a/fs/Kconfig b/fs/Kconfig index b11bd4b387e1..e7940882cbe8 100644 --- 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 index 354e2ba3ee67..1f18802f43a4 100644 --- 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 index 6679e07e533e..2e6f40344037 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c @@ -22,7 +22,7 @@ #include #include #include -#include "../cifs_common/arc4.h" +#include "../smbfs_common/arc4.h" #include int __cifs_calc_signature(struct smb_rqst *rqst, diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index 10047cc55286..4a0487753869 100644 --- 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/cifs_common/Makefile b/fs/smbfs_common/Makefile similarity index 59% rename from fs/cifs_common/Makefile rename to fs/smbfs_common/Makefile index 6fedd2f88a25..cafc61a3bfc3 100644 --- a/fs/cifs_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/cifs_common/arc4.h b/fs/smbfs_common/arc4.h similarity index 100% rename from fs/cifs_common/arc4.h rename to fs/smbfs_common/arc4.h diff --git a/fs/cifs_common/cifs_arc4.c b/fs/smbfs_common/cifs_arc4.c similarity index 91% rename from fs/cifs_common/cifs_arc4.c rename to fs/smbfs_common/cifs_arc4.c index b964cc682944..85ba15a60b13 100644 --- a/fs/cifs_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/cifs_common/cifs_md4.c b/fs/smbfs_common/cifs_md4.c similarity index 100% rename from fs/cifs_common/cifs_md4.c rename to fs/smbfs_common/cifs_md4.c diff --git a/fs/cifs_common/md4.h b/fs/smbfs_common/md4.h similarity index 100% rename from fs/cifs_common/md4.h rename to fs/smbfs_common/md4.h -- 2.20.1