Commit 23e91d8b authored by Steve French's avatar Steve French

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: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent fc111fb9
...@@ -352,7 +352,7 @@ source "fs/ceph/Kconfig" ...@@ -352,7 +352,7 @@ source "fs/ceph/Kconfig"
source "fs/cifs/Kconfig" source "fs/cifs/Kconfig"
source "fs/ksmbd/Kconfig" source "fs/ksmbd/Kconfig"
config CIFS_COMMON config SMBFS_COMMON
tristate tristate
default y if CIFS=y default y if CIFS=y
default m if CIFS=m default m if CIFS=m
......
...@@ -96,7 +96,7 @@ obj-$(CONFIG_LOCKD) += lockd/ ...@@ -96,7 +96,7 @@ obj-$(CONFIG_LOCKD) += lockd/
obj-$(CONFIG_NLS) += nls/ obj-$(CONFIG_NLS) += nls/
obj-$(CONFIG_UNICODE) += unicode/ obj-$(CONFIG_UNICODE) += unicode/
obj-$(CONFIG_SYSV_FS) += sysv/ obj-$(CONFIG_SYSV_FS) += sysv/
obj-$(CONFIG_CIFS_COMMON) += cifs_common/ obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
obj-$(CONFIG_CIFS) += cifs/ obj-$(CONFIG_CIFS) += cifs/
obj-$(CONFIG_SMB_SERVER) += ksmbd/ obj-$(CONFIG_SMB_SERVER) += ksmbd/
obj-$(CONFIG_HPFS_FS) += hpfs/ obj-$(CONFIG_HPFS_FS) += hpfs/
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/fips.h> #include <linux/fips.h>
#include "../cifs_common/arc4.h" #include "../smbfs_common/arc4.h"
#include <crypto/aead.h> #include <crypto/aead.h>
int __cifs_calc_signature(struct smb_rqst *rqst, int __cifs_calc_signature(struct smb_rqst *rqst,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "cifsglob.h" #include "cifsglob.h"
#include "cifs_debug.h" #include "cifs_debug.h"
#include "cifsproto.h" #include "cifsproto.h"
#include "../cifs_common/md4.h" #include "../smbfs_common/md4.h"
#ifndef false #ifndef false
#define false 0 #define false 0
......
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
# Makefile for Linux filesystem routines that are shared by client and server. # Makefile for Linux filesystem routines that are shared by client and server.
# #
obj-$(CONFIG_CIFS_COMMON) += cifs_arc4.o obj-$(CONFIG_SMBFS_COMMON) += cifs_arc4.o
obj-$(CONFIG_CIFS_COMMON) += cifs_md4.o obj-$(CONFIG_SMBFS_COMMON) += cifs_md4.o
...@@ -74,14 +74,14 @@ void cifs_arc4_crypt(struct arc4_ctx *ctx, u8 *out, const u8 *in, unsigned int l ...@@ -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); EXPORT_SYMBOL_GPL(cifs_arc4_crypt);
static int __init static int __init
init_cifs_common(void) init_smbfs_common(void)
{ {
return 0; return 0;
} }
static void __init static void __init
exit_cifs_common(void) exit_smbfs_common(void)
{ {
} }
module_init(init_cifs_common) module_init(init_smbfs_common)
module_exit(exit_cifs_common) module_exit(exit_smbfs_common)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment