@@ -372,7 +372,7 @@ config NFS_V4_2_SSC_HELPER
source "net/sunrpc/Kconfig"
source "fs/ceph/Kconfig"
-source "fs/cifs/Kconfig"
+source "fs/smbfs/Kconfig"
source "fs/ksmbd/Kconfig"
config SMBFS_COMMON
@@ -99,7 +99,7 @@ obj-$(CONFIG_NLS) += nls/
obj-y += unicode/
obj-$(CONFIG_SYSV_FS) += sysv/
obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
-obj-$(CONFIG_SMBFS) += cifs/
+obj-$(CONFIG_SMBFS) += smbfs/
obj-$(CONFIG_SMB_SERVER) += ksmbd/
obj-$(CONFIG_HPFS_FS) += hpfs/
obj-$(CONFIG_NTFS_FS) += ntfs/
similarity index 100%
rename from fs/cifs/Kconfig
rename to fs/smbfs/Kconfig
similarity index 100%
rename from fs/cifs/Makefile
rename to fs/smbfs/Makefile
similarity index 100%
rename from fs/cifs/asn1.c
rename to fs/smbfs/asn1.c
similarity index 100%
rename from fs/cifs/cifs_debug.c
rename to fs/smbfs/cifs_debug.c
similarity index 100%
rename from fs/cifs/cifs_debug.h
rename to fs/smbfs/cifs_debug.h
similarity index 100%
rename from fs/cifs/cifs_dfs_ref.c
rename to fs/smbfs/cifs_dfs_ref.c
similarity index 100%
rename from fs/cifs/cifs_fs_sb.h
rename to fs/smbfs/cifs_fs_sb.h
similarity index 100%
rename from fs/cifs/cifs_ioctl.h
rename to fs/smbfs/cifs_ioctl.h
similarity index 100%
rename from fs/cifs/cifs_spnego.c
rename to fs/smbfs/cifs_spnego.c
similarity index 100%
rename from fs/cifs/cifs_spnego.h
rename to fs/smbfs/cifs_spnego.h
similarity index 100%
rename from fs/cifs/cifs_spnego_negtokeninit.asn1
rename to fs/smbfs/cifs_spnego_negtokeninit.asn1
similarity index 100%
rename from fs/cifs/cifs_swn.c
rename to fs/smbfs/cifs_swn.c
similarity index 100%
rename from fs/cifs/cifs_swn.h
rename to fs/smbfs/cifs_swn.h
similarity index 100%
rename from fs/cifs/cifs_unicode.c
rename to fs/smbfs/cifs_unicode.c
similarity index 100%
rename from fs/cifs/cifs_unicode.h
rename to fs/smbfs/cifs_unicode.h
similarity index 100%
rename from fs/cifs/cifs_uniupr.h
rename to fs/smbfs/cifs_uniupr.h
similarity index 100%
rename from fs/cifs/cifsacl.c
rename to fs/smbfs/cifsacl.c
similarity index 100%
rename from fs/cifs/cifsacl.h
rename to fs/smbfs/cifsacl.h
similarity index 100%
rename from fs/cifs/cifsencrypt.c
rename to fs/smbfs/cifsencrypt.c
similarity index 100%
rename from fs/cifs/cifsglob.h
rename to fs/smbfs/cifsglob.h
similarity index 100%
rename from fs/cifs/cifspdu.h
rename to fs/smbfs/cifspdu.h
similarity index 100%
rename from fs/cifs/cifsproto.h
rename to fs/smbfs/cifsproto.h
similarity index 100%
rename from fs/cifs/cifsroot.c
rename to fs/smbfs/cifsroot.c
similarity index 100%
rename from fs/cifs/cifssmb.c
rename to fs/smbfs/cifssmb.c
similarity index 100%
rename from fs/cifs/connect.c
rename to fs/smbfs/connect.c
similarity index 100%
rename from fs/cifs/core.c
rename to fs/smbfs/core.c
similarity index 100%
rename from fs/cifs/dfs_cache.c
rename to fs/smbfs/dfs_cache.c
similarity index 100%
rename from fs/cifs/dfs_cache.h
rename to fs/smbfs/dfs_cache.h
similarity index 100%
rename from fs/cifs/dir.c
rename to fs/smbfs/dir.c
similarity index 100%
rename from fs/cifs/dns_resolve.c
rename to fs/smbfs/dns_resolve.c
similarity index 100%
rename from fs/cifs/dns_resolve.h
rename to fs/smbfs/dns_resolve.h
similarity index 100%
rename from fs/cifs/export.c
rename to fs/smbfs/export.c
similarity index 100%
rename from fs/cifs/file.c
rename to fs/smbfs/file.c
similarity index 100%
rename from fs/cifs/fs_context.c
rename to fs/smbfs/fs_context.c
similarity index 100%
rename from fs/cifs/fs_context.h
rename to fs/smbfs/fs_context.h
similarity index 100%
rename from fs/cifs/fscache.c
rename to fs/smbfs/fscache.c
similarity index 100%
rename from fs/cifs/fscache.h
rename to fs/smbfs/fscache.h
similarity index 100%
rename from fs/cifs/inode.c
rename to fs/smbfs/inode.c
similarity index 100%
rename from fs/cifs/ioctl.c
rename to fs/smbfs/ioctl.c
similarity index 100%
rename from fs/cifs/link.c
rename to fs/smbfs/link.c
similarity index 100%
rename from fs/cifs/misc.c
rename to fs/smbfs/misc.c
similarity index 100%
rename from fs/cifs/netlink.c
rename to fs/smbfs/netlink.c
similarity index 100%
rename from fs/cifs/netlink.h
rename to fs/smbfs/netlink.h
similarity index 100%
rename from fs/cifs/netmisc.c
rename to fs/smbfs/netmisc.c
similarity index 100%
rename from fs/cifs/nterr.c
rename to fs/smbfs/nterr.c
similarity index 100%
rename from fs/cifs/nterr.h
rename to fs/smbfs/nterr.h
similarity index 100%
rename from fs/cifs/ntlmssp.h
rename to fs/smbfs/ntlmssp.h
similarity index 100%
rename from fs/cifs/readdir.c
rename to fs/smbfs/readdir.c
similarity index 100%
rename from fs/cifs/rfc1002pdu.h
rename to fs/smbfs/rfc1002pdu.h
similarity index 100%
rename from fs/cifs/sess.c
rename to fs/smbfs/sess.c
similarity index 100%
rename from fs/cifs/smb1ops.c
rename to fs/smbfs/smb1ops.c
similarity index 100%
rename from fs/cifs/smb2file.c
rename to fs/smbfs/smb2file.c
similarity index 100%
rename from fs/cifs/smb2glob.h
rename to fs/smbfs/smb2glob.h
similarity index 100%
rename from fs/cifs/smb2inode.c
rename to fs/smbfs/smb2inode.c
similarity index 100%
rename from fs/cifs/smb2maperror.c
rename to fs/smbfs/smb2maperror.c
similarity index 100%
rename from fs/cifs/smb2misc.c
rename to fs/smbfs/smb2misc.c
similarity index 100%
rename from fs/cifs/smb2ops.c
rename to fs/smbfs/smb2ops.c
similarity index 100%
rename from fs/cifs/smb2pdu.c
rename to fs/smbfs/smb2pdu.c
similarity index 100%
rename from fs/cifs/smb2pdu.h
rename to fs/smbfs/smb2pdu.h
similarity index 100%
rename from fs/cifs/smb2proto.h
rename to fs/smbfs/smb2proto.h
similarity index 100%
rename from fs/cifs/smb2status.h
rename to fs/smbfs/smb2status.h
similarity index 100%
rename from fs/cifs/smb2transport.c
rename to fs/smbfs/smb2transport.c
similarity index 100%
rename from fs/cifs/smbdirect.c
rename to fs/smbfs/smbdirect.c
similarity index 100%
rename from fs/cifs/smbdirect.h
rename to fs/smbfs/smbdirect.h
similarity index 100%
rename from fs/cifs/smbencrypt.c
rename to fs/smbfs/smbencrypt.c
similarity index 100%
rename from fs/cifs/smberr.h
rename to fs/smbfs/smberr.h
similarity index 100%
rename from fs/cifs/smbfs.h
rename to fs/smbfs/smbfs.h
similarity index 100%
rename from fs/cifs/trace.c
rename to fs/smbfs/trace.c
similarity index 100%
rename from fs/cifs/trace.h
rename to fs/smbfs/trace.h
similarity index 100%
rename from fs/cifs/transport.c
rename to fs/smbfs/transport.c
similarity index 100%
rename from fs/cifs/unc.c
rename to fs/smbfs/unc.c
similarity index 100%
rename from fs/cifs/winucase.c
rename to fs/smbfs/winucase.c
similarity index 100%
rename from fs/cifs/xattr.c
rename to fs/smbfs/xattr.c
Update fs/Kconfig and fs/Makefile to reflect the change. Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de> --- fs/Kconfig | 2 +- fs/Makefile | 2 +- fs/{cifs => smbfs}/Kconfig | 0 fs/{cifs => smbfs}/Makefile | 0 fs/{cifs => smbfs}/asn1.c | 0 fs/{cifs => smbfs}/cifs_debug.c | 0 fs/{cifs => smbfs}/cifs_debug.h | 0 fs/{cifs => smbfs}/cifs_dfs_ref.c | 0 fs/{cifs => smbfs}/cifs_fs_sb.h | 0 fs/{cifs => smbfs}/cifs_ioctl.h | 0 fs/{cifs => smbfs}/cifs_spnego.c | 0 fs/{cifs => smbfs}/cifs_spnego.h | 0 fs/{cifs => smbfs}/cifs_spnego_negtokeninit.asn1 | 0 fs/{cifs => smbfs}/cifs_swn.c | 0 fs/{cifs => smbfs}/cifs_swn.h | 0 fs/{cifs => smbfs}/cifs_unicode.c | 0 fs/{cifs => smbfs}/cifs_unicode.h | 0 fs/{cifs => smbfs}/cifs_uniupr.h | 0 fs/{cifs => smbfs}/cifsacl.c | 0 fs/{cifs => smbfs}/cifsacl.h | 0 fs/{cifs => smbfs}/cifsencrypt.c | 0 fs/{cifs => smbfs}/cifsglob.h | 0 fs/{cifs => smbfs}/cifspdu.h | 0 fs/{cifs => smbfs}/cifsproto.h | 0 fs/{cifs => smbfs}/cifsroot.c | 0 fs/{cifs => smbfs}/cifssmb.c | 0 fs/{cifs => smbfs}/connect.c | 0 fs/{cifs => smbfs}/core.c | 0 fs/{cifs => smbfs}/dfs_cache.c | 0 fs/{cifs => smbfs}/dfs_cache.h | 0 fs/{cifs => smbfs}/dir.c | 0 fs/{cifs => smbfs}/dns_resolve.c | 0 fs/{cifs => smbfs}/dns_resolve.h | 0 fs/{cifs => smbfs}/export.c | 0 fs/{cifs => smbfs}/file.c | 0 fs/{cifs => smbfs}/fs_context.c | 0 fs/{cifs => smbfs}/fs_context.h | 0 fs/{cifs => smbfs}/fscache.c | 0 fs/{cifs => smbfs}/fscache.h | 0 fs/{cifs => smbfs}/inode.c | 0 fs/{cifs => smbfs}/ioctl.c | 0 fs/{cifs => smbfs}/link.c | 0 fs/{cifs => smbfs}/misc.c | 0 fs/{cifs => smbfs}/netlink.c | 0 fs/{cifs => smbfs}/netlink.h | 0 fs/{cifs => smbfs}/netmisc.c | 0 fs/{cifs => smbfs}/nterr.c | 0 fs/{cifs => smbfs}/nterr.h | 0 fs/{cifs => smbfs}/ntlmssp.h | 0 fs/{cifs => smbfs}/readdir.c | 0 fs/{cifs => smbfs}/rfc1002pdu.h | 0 fs/{cifs => smbfs}/sess.c | 0 fs/{cifs => smbfs}/smb1ops.c | 0 fs/{cifs => smbfs}/smb2file.c | 0 fs/{cifs => smbfs}/smb2glob.h | 0 fs/{cifs => smbfs}/smb2inode.c | 0 fs/{cifs => smbfs}/smb2maperror.c | 0 fs/{cifs => smbfs}/smb2misc.c | 0 fs/{cifs => smbfs}/smb2ops.c | 0 fs/{cifs => smbfs}/smb2pdu.c | 0 fs/{cifs => smbfs}/smb2pdu.h | 0 fs/{cifs => smbfs}/smb2proto.h | 0 fs/{cifs => smbfs}/smb2status.h | 0 fs/{cifs => smbfs}/smb2transport.c | 0 fs/{cifs => smbfs}/smbdirect.c | 0 fs/{cifs => smbfs}/smbdirect.h | 0 fs/{cifs => smbfs}/smbencrypt.c | 0 fs/{cifs => smbfs}/smberr.h | 0 fs/{cifs => smbfs}/smbfs.h | 0 fs/{cifs => smbfs}/trace.c | 0 fs/{cifs => smbfs}/trace.h | 0 fs/{cifs => smbfs}/transport.c | 0 fs/{cifs => smbfs}/unc.c | 0 fs/{cifs => smbfs}/winucase.c | 0 fs/{cifs => smbfs}/xattr.c | 0 75 files changed, 2 insertions(+), 2 deletions(-) rename fs/{cifs => smbfs}/Kconfig (100%) rename fs/{cifs => smbfs}/Makefile (100%) rename fs/{cifs => smbfs}/asn1.c (100%) rename fs/{cifs => smbfs}/cifs_debug.c (100%) rename fs/{cifs => smbfs}/cifs_debug.h (100%) rename fs/{cifs => smbfs}/cifs_dfs_ref.c (100%) rename fs/{cifs => smbfs}/cifs_fs_sb.h (100%) rename fs/{cifs => smbfs}/cifs_ioctl.h (100%) rename fs/{cifs => smbfs}/cifs_spnego.c (100%) rename fs/{cifs => smbfs}/cifs_spnego.h (100%) rename fs/{cifs => smbfs}/cifs_spnego_negtokeninit.asn1 (100%) rename fs/{cifs => smbfs}/cifs_swn.c (100%) rename fs/{cifs => smbfs}/cifs_swn.h (100%) rename fs/{cifs => smbfs}/cifs_unicode.c (100%) rename fs/{cifs => smbfs}/cifs_unicode.h (100%) rename fs/{cifs => smbfs}/cifs_uniupr.h (100%) rename fs/{cifs => smbfs}/cifsacl.c (100%) rename fs/{cifs => smbfs}/cifsacl.h (100%) rename fs/{cifs => smbfs}/cifsencrypt.c (100%) rename fs/{cifs => smbfs}/cifsglob.h (100%) rename fs/{cifs => smbfs}/cifspdu.h (100%) rename fs/{cifs => smbfs}/cifsproto.h (100%) rename fs/{cifs => smbfs}/cifsroot.c (100%) rename fs/{cifs => smbfs}/cifssmb.c (100%) rename fs/{cifs => smbfs}/connect.c (100%) rename fs/{cifs => smbfs}/core.c (100%) rename fs/{cifs => smbfs}/dfs_cache.c (100%) rename fs/{cifs => smbfs}/dfs_cache.h (100%) rename fs/{cifs => smbfs}/dir.c (100%) rename fs/{cifs => smbfs}/dns_resolve.c (100%) rename fs/{cifs => smbfs}/dns_resolve.h (100%) rename fs/{cifs => smbfs}/export.c (100%) rename fs/{cifs => smbfs}/file.c (100%) rename fs/{cifs => smbfs}/fs_context.c (100%) rename fs/{cifs => smbfs}/fs_context.h (100%) rename fs/{cifs => smbfs}/fscache.c (100%) rename fs/{cifs => smbfs}/fscache.h (100%) rename fs/{cifs => smbfs}/inode.c (100%) rename fs/{cifs => smbfs}/ioctl.c (100%) rename fs/{cifs => smbfs}/link.c (100%) rename fs/{cifs => smbfs}/misc.c (100%) rename fs/{cifs => smbfs}/netlink.c (100%) rename fs/{cifs => smbfs}/netlink.h (100%) rename fs/{cifs => smbfs}/netmisc.c (100%) rename fs/{cifs => smbfs}/nterr.c (100%) rename fs/{cifs => smbfs}/nterr.h (100%) rename fs/{cifs => smbfs}/ntlmssp.h (100%) rename fs/{cifs => smbfs}/readdir.c (100%) rename fs/{cifs => smbfs}/rfc1002pdu.h (100%) rename fs/{cifs => smbfs}/sess.c (100%) rename fs/{cifs => smbfs}/smb1ops.c (100%) rename fs/{cifs => smbfs}/smb2file.c (100%) rename fs/{cifs => smbfs}/smb2glob.h (100%) rename fs/{cifs => smbfs}/smb2inode.c (100%) rename fs/{cifs => smbfs}/smb2maperror.c (100%) rename fs/{cifs => smbfs}/smb2misc.c (100%) rename fs/{cifs => smbfs}/smb2ops.c (100%) rename fs/{cifs => smbfs}/smb2pdu.c (100%) rename fs/{cifs => smbfs}/smb2pdu.h (100%) rename fs/{cifs => smbfs}/smb2proto.h (100%) rename fs/{cifs => smbfs}/smb2status.h (100%) rename fs/{cifs => smbfs}/smb2transport.c (100%) rename fs/{cifs => smbfs}/smbdirect.c (100%) rename fs/{cifs => smbfs}/smbdirect.h (100%) rename fs/{cifs => smbfs}/smbencrypt.c (100%) rename fs/{cifs => smbfs}/smberr.h (100%) rename fs/{cifs => smbfs}/smbfs.h (100%) rename fs/{cifs => smbfs}/trace.c (100%) rename fs/{cifs => smbfs}/trace.h (100%) rename fs/{cifs => smbfs}/transport.c (100%) rename fs/{cifs => smbfs}/unc.c (100%) rename fs/{cifs => smbfs}/winucase.c (100%) rename fs/{cifs => smbfs}/xattr.c (100%)