Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

+10 -10
+1 -1
fs/Kconfig
··· 352 352 source "fs/cifs/Kconfig" 353 353 source "fs/ksmbd/Kconfig" 354 354 355 - config CIFS_COMMON 355 + config SMBFS_COMMON 356 356 tristate 357 357 default y if CIFS=y 358 358 default m if CIFS=m
+1 -1
fs/Makefile
··· 96 96 obj-$(CONFIG_NLS) += nls/ 97 97 obj-$(CONFIG_UNICODE) += unicode/ 98 98 obj-$(CONFIG_SYSV_FS) += sysv/ 99 - obj-$(CONFIG_CIFS_COMMON) += cifs_common/ 99 + obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/ 100 100 obj-$(CONFIG_CIFS) += cifs/ 101 101 obj-$(CONFIG_SMB_SERVER) += ksmbd/ 102 102 obj-$(CONFIG_HPFS_FS) += hpfs/
+1 -1
fs/cifs/cifsencrypt.c
··· 22 22 #include <linux/random.h> 23 23 #include <linux/highmem.h> 24 24 #include <linux/fips.h> 25 - #include "../cifs_common/arc4.h" 25 + #include "../smbfs_common/arc4.h" 26 26 #include <crypto/aead.h> 27 27 28 28 int __cifs_calc_signature(struct smb_rqst *rqst,
+1 -1
fs/cifs/smbencrypt.c
··· 24 24 #include "cifsglob.h" 25 25 #include "cifs_debug.h" 26 26 #include "cifsproto.h" 27 - #include "../cifs_common/md4.h" 27 + #include "../smbfs_common/md4.h" 28 28 29 29 #ifndef false 30 30 #define false 0
+2 -2
fs/cifs_common/Makefile fs/smbfs_common/Makefile
··· 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
fs/cifs_common/arc4.h fs/smbfs_common/arc4.h
+4 -4
fs/cifs_common/cifs_arc4.c fs/smbfs_common/cifs_arc4.c
··· 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)
fs/cifs_common/cifs_md4.c fs/smbfs_common/cifs_md4.c
fs/cifs_common/md4.h fs/smbfs_common/md4.h