[RFC] cifs: rename module to "smbfs.ko"

Commit Message

Enzo Matsumiya July 27, 2023, 7:18 p.m. UTC

Change the kernel object name to "smbfs.ko".
Also create a MODULE_ALIAS_FS for "smbfs".

Keep "cifs" and "smb3" module aliases for compatibility with existing
scripts/tools.

Signed-off-by: Enzo Matsumiya <[e-mail]>
---

Ideally (IMHO) we should:
1) have a single "smbfs" file_system_type struct, but that needs a respective
   patch in cifs-utils (I can send one if interested) and some time so such
   modification can get widespread adoption
2) rename Kconfig CONFIG_CIFS* as well
3) remove dependency on file system type/disable_legacy_dialects flag for SMB1
   abandonment and rely only on the build-time CONFIG_CIFS_ALLOW_INSECURE_LEGACY

Cheers,
Enzo

 fs/smb/client/Makefile | 20 ++++++++++----------
 fs/smb/client/cifsfs.c |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

Patch

diff --git a/fs/smb/client/Makefile b/fs/smb/client/Makefile
index 304a7f6cc13a..e78b8b4ad2ee 100644
--- a/fs/smb/client/Makefile
+++ b/fs/smb/client/Makefile
@@ -3,9 +3,9 @@ 
 # Makefile for Linux CIFS/SMB2/SMB3 VFS client
 #
 ccflags-y += -I$(src)		# needed for trace events
-obj-$(CONFIG_CIFS) += cifs.o
+obj-$(CONFIG_CIFS) += smbfs.o
 
-cifs-y := trace.o cifsfs.o cifs_debug.o connect.o dir.o file.o \
+smbfs-y := trace.o cifsfs.o cifs_debug.o connect.o dir.o file.o \
 	  inode.o link.o misc.o netmisc.o smbencrypt.o transport.o \
 	  cached_dir.o cifs_unicode.o nterr.o cifsencrypt.o \
 	  readdir.o ioctl.o sess.o export.o unc.o winucase.o \
@@ -17,18 +17,18 @@  $(obj)/asn1.o: $(obj)/cifs_spnego_negtokeninit.asn1.h
 
 $(obj)/cifs_spnego_negtokeninit.asn1.o: $(obj)/cifs_spnego_negtokeninit.asn1.c $(obj)/cifs_spnego_negtokeninit.asn1.h
 
-cifs-$(CONFIG_CIFS_XATTR) += xattr.o
+smbfs-$(CONFIG_CIFS_XATTR) += xattr.o
 
-cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o
+smbfs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o
 
-cifs-$(CONFIG_CIFS_DFS_UPCALL) += cifs_dfs_ref.o dfs_cache.o dfs.o
+smbfs-$(CONFIG_CIFS_DFS_UPCALL) += cifs_dfs_ref.o dfs_cache.o dfs.o
 
-cifs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o cifs_swn.o
+smbfs-$(CONFIG_CIFS_SWN_UPCALL) += netlink.o cifs_swn.o
 
-cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o
+smbfs-$(CONFIG_CIFS_FSCACHE) += fscache.o
 
-cifs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o
+smbfs-$(CONFIG_CIFS_SMB_DIRECT) += smbdirect.o
 
-cifs-$(CONFIG_CIFS_ROOT) += cifsroot.o
+smbfs-$(CONFIG_CIFS_ROOT) += cifsroot.o
 
-cifs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += smb1ops.o cifssmb.o
+smbfs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += smb1ops.o cifssmb.o
diff --git a/fs/smb/client/cifsfs.c b/fs/smb/client/cifsfs.c
index a4d8b0ea1c8c..b6f42a0ef9ee 100644
--- a/fs/smb/client/cifsfs.c
+++ b/fs/smb/client/cifsfs.c
@@ -1109,6 +1109,8 @@  cifs_setlease(struct file *file, long arg, struct file_lock **lease, void **priv
 		return -EAGAIN;
 }
 
+MODULE_ALIAS_FS("smbfs");
+
 struct file_system_type cifs_fs_type = {
 	.owner = THIS_MODULE,
 	.name = "cifs",