linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* cifs: rename fs/cifs directory to fs/smbfs
@ 2021-09-13  5:16 Steve French
  2021-09-14  5:27 ` Steve French
  0 siblings, 1 reply; 2+ messages in thread
From: Steve French @ 2021-09-13  5:16 UTC (permalink / raw)
  To: CIFS

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

To be more consistent with the source directory name for the
new smb3 server (ksmbd), and to avoid using the word "cifs"
(a very old dialect) when more recent dialects (like SMB3 or
SMB3.1.1) are meant, rename the client directory from
fs/cifs to fs/smbfs. It is already possible to do
"modprobe smb3" or "mount -t smb3 ..."

Note that this does not rename the module itself (cifs.ko)
although that could be done in a future patch.

-- 
Thanks,

Steve

[-- Attachment #2: 0001-cifs-rename-fs-cifs-directory-to-fs-smbfs.patch --]
[-- Type: text/x-patch, Size: 34524 bytes --]

From bba805a46c91e7a8a1d04704e5409f890acf8b66 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Mon, 13 Sep 2021 00:08:08 -0500
Subject: [PATCH] cifs: rename fs/cifs directory to fs/smbfs

To be more consistent with the source directory name for the
new smb3 server (ksmbd), and to avoid using the word "cifs"
(a very old dialect) when more recent dialects (like SMB3 or
SMB3.1.1) are meant, rename the client directory from
fs/cifs to fs/smbfs. It is already possible to do
"modprobe smb3" or "mount -t smb3 ..."

Note that this does not rename the module itself (cifs.ko)
although that could be done in a future patch.

Signed-off-by: Steve French <stfrench@microsoft.com>
---
 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}/cache.c                        | 2 +-
 fs/{cifs => smbfs}/cifs_debug.c                   | 1 -
 fs/{cifs => smbfs}/cifs_debug.h                   | 0
 fs/{cifs => smbfs}/cifs_dfs_ref.c                 | 0
 fs/{cifs => smbfs}/cifs_fs_sb.h                   | 1 -
 fs/{cifs => smbfs}/cifs_ioctl.h                   | 1 -
 fs/{cifs => smbfs}/cifs_spnego.c                  | 2 +-
 fs/{cifs => smbfs}/cifs_spnego.h                  | 2 +-
 fs/{cifs => smbfs}/cifs_spnego_negtokeninit.asn1  | 0
 fs/{cifs => smbfs}/cifs_swn.c                     | 2 +-
 fs/{cifs => smbfs}/cifs_swn.h                     | 0
 fs/{cifs => smbfs}/cifs_unicode.c                 | 1 -
 fs/{cifs => smbfs}/cifs_unicode.h                 | 0
 fs/{cifs => smbfs}/cifs_uniupr.h                  | 0
 fs/{cifs => smbfs}/cifsacl.c                      | 1 -
 fs/{cifs => smbfs}/cifsacl.h                      | 1 -
 fs/{cifs => smbfs}/cifsencrypt.c                  | 1 -
 fs/{cifs => smbfs}/cifsfs.c                       | 1 -
 fs/{cifs => smbfs}/cifsfs.h                       | 1 -
 fs/{cifs => smbfs}/cifsglob.h                     | 3 +--
 fs/{cifs => smbfs}/cifspdu.h                      | 1 -
 fs/{cifs => smbfs}/cifsproto.h                    | 1 -
 fs/{cifs => smbfs}/cifsroot.c                     | 0
 fs/{cifs => smbfs}/cifssmb.c                      | 1 -
 fs/{cifs => smbfs}/connect.c                      | 1 -
 fs/{cifs => smbfs}/dfs_cache.c                    | 0
 fs/{cifs => smbfs}/dfs_cache.h                    | 0
 fs/{cifs => smbfs}/dir.c                          | 1 -
 fs/{cifs => smbfs}/dns_resolve.c                  | 1 -
 fs/{cifs => smbfs}/dns_resolve.h                  | 4 ++--
 fs/{cifs => smbfs}/export.c                       | 1 -
 fs/{cifs => smbfs}/file.c                         | 1 -
 fs/{cifs => smbfs}/fs_context.c                   | 0
 fs/{cifs => smbfs}/fs_context.h                   | 0
 fs/{cifs => smbfs}/fscache.c                      | 2 +-
 fs/{cifs => smbfs}/fscache.h                      | 2 +-
 fs/{cifs => smbfs}/inode.c                        | 1 -
 fs/{cifs => smbfs}/ioctl.c                        | 1 -
 fs/{cifs => smbfs}/link.c                         | 1 -
 fs/{cifs => smbfs}/misc.c                         | 1 -
 fs/{cifs => smbfs}/netlink.c                      | 2 +-
 fs/{cifs => smbfs}/netlink.h                      | 0
 fs/{cifs => smbfs}/netmisc.c                      | 1 -
 fs/{cifs => smbfs}/nterr.c                        | 0
 fs/{cifs => smbfs}/nterr.h                        | 0
 fs/{cifs => smbfs}/ntlmssp.h                      | 1 -
 fs/{cifs => smbfs}/readdir.c                      | 1 -
 fs/{cifs => smbfs}/rfc1002pdu.h                   | 1 -
 fs/{cifs => smbfs}/sess.c                         | 1 -
 fs/{cifs => smbfs}/smb1ops.c                      | 0
 fs/{cifs => smbfs}/smb2file.c                     | 1 -
 fs/{cifs => smbfs}/smb2glob.h                     | 1 -
 fs/{cifs => smbfs}/smb2inode.c                    | 1 -
 fs/{cifs => smbfs}/smb2maperror.c                 | 0
 fs/{cifs => smbfs}/smb2misc.c                     | 1 -
 fs/{cifs => smbfs}/smb2ops.c                      | 0
 fs/{cifs => smbfs}/smb2pdu.c                      | 1 -
 fs/{cifs => smbfs}/smb2pdu.h                      | 1 -
 fs/{cifs => smbfs}/smb2proto.h                    | 1 -
 fs/{cifs => smbfs}/smb2status.h                   | 1 -
 fs/{cifs => smbfs}/smb2transport.c                | 1 -
 fs/{cifs => smbfs}/smbdirect.c                    | 0
 fs/{cifs => smbfs}/smbdirect.h                    | 0
 fs/{cifs => smbfs}/smbencrypt.c                   | 0
 fs/{cifs => smbfs}/smberr.h                       | 1 -
 fs/{cifs => smbfs}/trace.c                        | 0
 fs/{cifs => smbfs}/trace.h                        | 0
 fs/{cifs => smbfs}/transport.c                    | 1 -
 fs/{cifs => smbfs}/unc.c                          | 0
 fs/{cifs => smbfs}/winucase.c                     | 1 -
 fs/{cifs => smbfs}/xattr.c                        | 1 -
 include/uapi/linux/{cifs => smbfs}/cifs_mount.h   | 1 -
 include/uapi/linux/{cifs => smbfs}/cifs_netlink.h | 0
 78 files changed, 12 insertions(+), 53 deletions(-)
 rename fs/{cifs => smbfs}/Kconfig (100%)
 rename fs/{cifs => smbfs}/Makefile (100%)
 rename fs/{cifs => smbfs}/asn1.c (100%)
 rename fs/{cifs => smbfs}/cache.c (97%)
 rename fs/{cifs => smbfs}/cifs_debug.c (99%)
 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 (99%)
 rename fs/{cifs => smbfs}/cifs_ioctl.h (99%)
 rename fs/{cifs => smbfs}/cifs_spnego.c (98%)
 rename fs/{cifs => smbfs}/cifs_spnego.h (92%)
 rename fs/{cifs => smbfs}/cifs_spnego_negtokeninit.asn1 (100%)
 rename fs/{cifs => smbfs}/cifs_swn.c (99%)
 rename fs/{cifs => smbfs}/cifs_swn.h (100%)
 rename fs/{cifs => smbfs}/cifs_unicode.c (99%)
 rename fs/{cifs => smbfs}/cifs_unicode.h (100%)
 rename fs/{cifs => smbfs}/cifs_uniupr.h (100%)
 rename fs/{cifs => smbfs}/cifsacl.c (99%)
 rename fs/{cifs => smbfs}/cifsacl.h (99%)
 rename fs/{cifs => smbfs}/cifsencrypt.c (99%)
 rename fs/{cifs => smbfs}/cifsfs.c (99%)
 rename fs/{cifs => smbfs}/cifsfs.h (99%)
 rename fs/{cifs => smbfs}/cifsglob.h (99%)
 rename fs/{cifs => smbfs}/cifspdu.h (99%)
 rename fs/{cifs => smbfs}/cifsproto.h (99%)
 rename fs/{cifs => smbfs}/cifsroot.c (100%)
 rename fs/{cifs => smbfs}/cifssmb.c (99%)
 rename fs/{cifs => smbfs}/connect.c (99%)
 rename fs/{cifs => smbfs}/dfs_cache.c (100%)
 rename fs/{cifs => smbfs}/dfs_cache.h (100%)
 rename fs/{cifs => smbfs}/dir.c (99%)
 rename fs/{cifs => smbfs}/dns_resolve.c (98%)
 rename fs/{cifs => smbfs}/dns_resolve.h (71%)
 rename fs/{cifs => smbfs}/export.c (98%)
 rename fs/{cifs => smbfs}/file.c (99%)
 rename fs/{cifs => smbfs}/fs_context.c (100%)
 rename fs/{cifs => smbfs}/fs_context.h (100%)
 rename fs/{cifs => smbfs}/fscache.c (99%)
 rename fs/{cifs => smbfs}/fscache.h (98%)
 rename fs/{cifs => smbfs}/inode.c (99%)
 rename fs/{cifs => smbfs}/ioctl.c (99%)
 rename fs/{cifs => smbfs}/link.c (99%)
 rename fs/{cifs => smbfs}/misc.c (99%)
 rename fs/{cifs => smbfs}/netlink.c (98%)
 rename fs/{cifs => smbfs}/netlink.h (100%)
 rename fs/{cifs => smbfs}/netmisc.c (99%)
 rename fs/{cifs => smbfs}/nterr.c (100%)
 rename fs/{cifs => smbfs}/nterr.h (100%)
 rename fs/{cifs => smbfs}/ntlmssp.h (99%)
 rename fs/{cifs => smbfs}/readdir.c (99%)
 rename fs/{cifs => smbfs}/rfc1002pdu.h (98%)
 rename fs/{cifs => smbfs}/sess.c (99%)
 rename fs/{cifs => smbfs}/smb1ops.c (100%)
 rename fs/{cifs => smbfs}/smb2file.c (99%)
 rename fs/{cifs => smbfs}/smb2glob.h (98%)
 rename fs/{cifs => smbfs}/smb2inode.c (99%)
 rename fs/{cifs => smbfs}/smb2maperror.c (100%)
 rename fs/{cifs => smbfs}/smb2misc.c (99%)
 rename fs/{cifs => smbfs}/smb2ops.c (100%)
 rename fs/{cifs => smbfs}/smb2pdu.c (99%)
 rename fs/{cifs => smbfs}/smb2pdu.h (99%)
 rename fs/{cifs => smbfs}/smb2proto.h (99%)
 rename fs/{cifs => smbfs}/smb2status.h (99%)
 rename fs/{cifs => smbfs}/smb2transport.c (99%)
 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 (99%)
 rename fs/{cifs => smbfs}/trace.c (100%)
 rename fs/{cifs => smbfs}/trace.h (100%)
 rename fs/{cifs => smbfs}/transport.c (99%)
 rename fs/{cifs => smbfs}/unc.c (100%)
 rename fs/{cifs => smbfs}/winucase.c (99%)
 rename fs/{cifs => smbfs}/xattr.c (99%)
 rename include/uapi/linux/{cifs => smbfs}/cifs_mount.h (96%)
 rename include/uapi/linux/{cifs => smbfs}/cifs_netlink.h (100%)

diff --git a/fs/Kconfig b/fs/Kconfig
index a6313a969bc5..0985ca3ea93a 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -364,7 +364,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
diff --git a/fs/Makefile b/fs/Makefile
index 84c5e4cdfee5..a4fd97a86d52 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -97,7 +97,7 @@ obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_UNICODE)		+= unicode/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_SMBFS_COMMON)	+= smbfs_common/
-obj-$(CONFIG_CIFS)		+= cifs/
+obj-$(CONFIG_CIFS)		+= smbfs/
 obj-$(CONFIG_SMB_SERVER)	+= ksmbd/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
diff --git a/fs/cifs/Kconfig b/fs/smbfs/Kconfig
similarity index 100%
rename from fs/cifs/Kconfig
rename to fs/smbfs/Kconfig
diff --git a/fs/cifs/Makefile b/fs/smbfs/Makefile
similarity index 100%
rename from fs/cifs/Makefile
rename to fs/smbfs/Makefile
diff --git a/fs/cifs/asn1.c b/fs/smbfs/asn1.c
similarity index 100%
rename from fs/cifs/asn1.c
rename to fs/smbfs/asn1.c
diff --git a/fs/cifs/cache.c b/fs/smbfs/cache.c
similarity index 97%
rename from fs/cifs/cache.c
rename to fs/smbfs/cache.c
index 8a3b30ec860c..8be57aaedab6 100644
--- a/fs/cifs/cache.c
+++ b/fs/smbfs/cache.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cache.c - CIFS filesystem cache index structure definitions
+ *   CIFS filesystem cache index structure definitions
  *
  *   Copyright (c) 2010 Novell, Inc.
  *   Authors(s): Suresh Jayaraman (sjayaraman@suse.de>
diff --git a/fs/cifs/cifs_debug.c b/fs/smbfs/cifs_debug.c
similarity index 99%
rename from fs/cifs/cifs_debug.c
rename to fs/smbfs/cifs_debug.c
index 51a824fc926a..de2c12bcfa4b 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/smbfs/cifs_debug.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- *   fs/cifs_debug.c
  *
  *   Copyright (C) International Business Machines  Corp., 2000,2005
  *
diff --git a/fs/cifs/cifs_debug.h b/fs/smbfs/cifs_debug.h
similarity index 100%
rename from fs/cifs/cifs_debug.h
rename to fs/smbfs/cifs_debug.h
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smbfs/cifs_dfs_ref.c
similarity index 100%
rename from fs/cifs/cifs_dfs_ref.c
rename to fs/smbfs/cifs_dfs_ref.c
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smbfs/cifs_fs_sb.h
similarity index 99%
rename from fs/cifs/cifs_fs_sb.h
rename to fs/smbfs/cifs_fs_sb.h
index 4fd788586399..f97407520ea1 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/smbfs/cifs_fs_sb.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifs_fs_sb.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2004
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifs_ioctl.h b/fs/smbfs/cifs_ioctl.h
similarity index 99%
rename from fs/cifs/cifs_ioctl.h
rename to fs/smbfs/cifs_ioctl.h
index ef723be358af..b87cbbe6d2d4 100644
--- a/fs/cifs/cifs_ioctl.h
+++ b/fs/smbfs/cifs_ioctl.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifs_ioctl.h
  *
  *   Structure definitions for io control for cifs/smb3
  *
diff --git a/fs/cifs/cifs_spnego.c b/fs/smbfs/cifs_spnego.c
similarity index 98%
rename from fs/cifs/cifs_spnego.c
rename to fs/smbfs/cifs_spnego.c
index 8fa26a8530f8..353bd0dd7026 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/smbfs/cifs_spnego.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cifs_spnego.c -- SPNEGO upcall management for CIFS
+ *   SPNEGO upcall management for CIFS
  *
  *   Copyright (c) 2007 Red Hat, Inc.
  *   Author(s): Jeff Layton (jlayton@redhat.com)
diff --git a/fs/cifs/cifs_spnego.h b/fs/smbfs/cifs_spnego.h
similarity index 92%
rename from fs/cifs/cifs_spnego.h
rename to fs/smbfs/cifs_spnego.h
index 31387d0ea32e..e6a0451877d4 100644
--- a/fs/cifs/cifs_spnego.h
+++ b/fs/smbfs/cifs_spnego.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifs_spnego.h -- SPNEGO upcall management for CIFS
+ *   SPNEGO upcall management for CIFS
  *
  *   Copyright (c) 2007 Red Hat, Inc.
  *   Author(s): Jeff Layton (jlayton@redhat.com)
diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smbfs/cifs_spnego_negtokeninit.asn1
similarity index 100%
rename from fs/cifs/cifs_spnego_negtokeninit.asn1
rename to fs/smbfs/cifs_spnego_negtokeninit.asn1
diff --git a/fs/cifs/cifs_swn.c b/fs/smbfs/cifs_swn.c
similarity index 99%
rename from fs/cifs/cifs_swn.c
rename to fs/smbfs/cifs_swn.c
index 12bde7bfda86..e481c3023401 100644
--- a/fs/cifs/cifs_swn.c
+++ b/fs/smbfs/cifs_swn.c
@@ -7,7 +7,7 @@
 
 #include <linux/kref.h>
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs/cifs_netlink.h>
 
 #include "cifs_swn.h"
 #include "cifsglob.h"
diff --git a/fs/cifs/cifs_swn.h b/fs/smbfs/cifs_swn.h
similarity index 100%
rename from fs/cifs/cifs_swn.h
rename to fs/smbfs/cifs_swn.h
diff --git a/fs/cifs/cifs_unicode.c b/fs/smbfs/cifs_unicode.c
similarity index 99%
rename from fs/cifs/cifs_unicode.c
rename to fs/smbfs/cifs_unicode.c
index 171ad8b42107..e7582dd79179 100644
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/smbfs/cifs_unicode.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- *   fs/cifs/cifs_unicode.c
  *
  *   Copyright (c) International Business Machines  Corp., 2000,2009
  *   Modified by Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifs_unicode.h b/fs/smbfs/cifs_unicode.h
similarity index 100%
rename from fs/cifs/cifs_unicode.h
rename to fs/smbfs/cifs_unicode.h
diff --git a/fs/cifs/cifs_uniupr.h b/fs/smbfs/cifs_uniupr.h
similarity index 100%
rename from fs/cifs/cifs_uniupr.h
rename to fs/smbfs/cifs_uniupr.h
diff --git a/fs/cifs/cifsacl.c b/fs/smbfs/cifsacl.c
similarity index 99%
rename from fs/cifs/cifsacl.c
rename to fs/smbfs/cifsacl.c
index 388eb536cff1..ee3aab3dd4ac 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/smbfs/cifsacl.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cifsacl.c
  *
  *   Copyright (C) International Business Machines  Corp., 2007,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsacl.h b/fs/smbfs/cifsacl.h
similarity index 99%
rename from fs/cifs/cifsacl.h
rename to fs/smbfs/cifsacl.h
index f8292bcf8594..ccbfc754bd3c 100644
--- a/fs/cifs/cifsacl.h
+++ b/fs/smbfs/cifsacl.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifsacl.h
  *
  *   Copyright (c) International Business Machines  Corp., 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsencrypt.c b/fs/smbfs/cifsencrypt.c
similarity index 99%
rename from fs/cifs/cifsencrypt.c
rename to fs/smbfs/cifsencrypt.c
index 2e6f40344037..d118282071b3 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/smbfs/cifsencrypt.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cifsencrypt.c
  *
  *   Encryption and hashing operations relating to NTLM, NTLMv2.  See MS-NLMP
  *   for more detailed information
diff --git a/fs/cifs/cifsfs.c b/fs/smbfs/cifsfs.c
similarity index 99%
rename from fs/cifs/cifsfs.c
rename to fs/smbfs/cifsfs.c
index 8c20bfa187ac..9fa930dfd78d 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/smbfs/cifsfs.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cifsfs.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsfs.h b/fs/smbfs/cifsfs.h
similarity index 99%
rename from fs/cifs/cifsfs.h
rename to fs/smbfs/cifsfs.h
index d25a4099b32e..b50da1901ebd 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/smbfs/cifsfs.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifsfs.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002, 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsglob.h b/fs/smbfs/cifsglob.h
similarity index 99%
rename from fs/cifs/cifsglob.h
rename to fs/smbfs/cifsglob.h
index c068f7d8d879..b4114113b95e 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/smbfs/cifsglob.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifsglob.h
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
@@ -20,7 +19,7 @@
 #include "cifsacl.h"
 #include <crypto/internal/hash.h>
 #include <linux/scatterlist.h>
-#include <uapi/linux/cifs/cifs_mount.h>
+#include <uapi/linux/smbfs/cifs_mount.h>
 #include "smb2pdu.h"
 
 #define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
diff --git a/fs/cifs/cifspdu.h b/fs/smbfs/cifspdu.h
similarity index 99%
rename from fs/cifs/cifspdu.h
rename to fs/smbfs/cifspdu.h
index 98e8e5aa0613..d2ff438fd31f 100644
--- a/fs/cifs/cifspdu.h
+++ b/fs/smbfs/cifspdu.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifspdu.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2009
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsproto.h b/fs/smbfs/cifsproto.h
similarity index 99%
rename from fs/cifs/cifsproto.h
rename to fs/smbfs/cifsproto.h
index f9740c21ca3d..54966c1a8eb6 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/smbfs/cifsproto.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/cifsproto.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/cifsroot.c b/fs/smbfs/cifsroot.c
similarity index 100%
rename from fs/cifs/cifsroot.c
rename to fs/smbfs/cifsroot.c
diff --git a/fs/cifs/cifssmb.c b/fs/smbfs/cifssmb.c
similarity index 99%
rename from fs/cifs/cifssmb.c
rename to fs/smbfs/cifssmb.c
index a8e41c1e80ca..243d17696f06 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/smbfs/cifssmb.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/cifssmb.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2010
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/connect.c b/fs/smbfs/connect.c
similarity index 99%
rename from fs/cifs/connect.c
rename to fs/smbfs/connect.c
index 0db344807ef1..399a0f084573 100644
--- a/fs/cifs/connect.c
+++ b/fs/smbfs/connect.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/connect.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2011
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/dfs_cache.c b/fs/smbfs/dfs_cache.c
similarity index 100%
rename from fs/cifs/dfs_cache.c
rename to fs/smbfs/dfs_cache.c
diff --git a/fs/cifs/dfs_cache.h b/fs/smbfs/dfs_cache.h
similarity index 100%
rename from fs/cifs/dfs_cache.h
rename to fs/smbfs/dfs_cache.h
diff --git a/fs/cifs/dir.c b/fs/smbfs/dir.c
similarity index 99%
rename from fs/cifs/dir.c
rename to fs/smbfs/dir.c
index 5f8a302ffcb2..6e8e7cc26ae2 100644
--- a/fs/cifs/dir.c
+++ b/fs/smbfs/dir.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/dir.c
  *
  *   vfs operations that deal with dentries
  *
diff --git a/fs/cifs/dns_resolve.c b/fs/smbfs/dns_resolve.c
similarity index 98%
rename from fs/cifs/dns_resolve.c
rename to fs/smbfs/dns_resolve.c
index 8c616aaeb7c4..0458d28d71aa 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/smbfs/dns_resolve.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *  fs/cifs/dns_resolve.c
  *
  *   Copyright (c) 2007 Igor Mammedov
  *   Author(s): Igor Mammedov (niallain@gmail.com)
diff --git a/fs/cifs/dns_resolve.h b/fs/smbfs/dns_resolve.h
similarity index 71%
rename from fs/cifs/dns_resolve.h
rename to fs/smbfs/dns_resolve.h
index 9fa2807ef79e..afc0df381246 100644
--- a/fs/cifs/dns_resolve.h
+++ b/fs/smbfs/dns_resolve.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/dns_resolve.h -- DNS Resolver upcall management for CIFS DFS
- *                            Handles host name to IP address resolution
+ *   DNS Resolver upcall management for CIFS DFS
+ *   Handles host name to IP address resolution
  *
  *   Copyright (c) International Business Machines  Corp., 2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/export.c b/fs/smbfs/export.c
similarity index 98%
rename from fs/cifs/export.c
rename to fs/smbfs/export.c
index 747a540db954..37c28415df1e 100644
--- a/fs/cifs/export.c
+++ b/fs/smbfs/export.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/export.c
  *
  *   Copyright (C) International Business Machines  Corp., 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/file.c b/fs/smbfs/file.c
similarity index 99%
rename from fs/cifs/file.c
rename to fs/smbfs/file.c
index d0216472f1c6..4d10c9343890 100644
--- a/fs/cifs/file.c
+++ b/fs/smbfs/file.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/file.c
  *
  *   vfs operations that deal with files
  *
diff --git a/fs/cifs/fs_context.c b/fs/smbfs/fs_context.c
similarity index 100%
rename from fs/cifs/fs_context.c
rename to fs/smbfs/fs_context.c
diff --git a/fs/cifs/fs_context.h b/fs/smbfs/fs_context.h
similarity index 100%
rename from fs/cifs/fs_context.h
rename to fs/smbfs/fs_context.h
diff --git a/fs/cifs/fscache.c b/fs/smbfs/fscache.c
similarity index 99%
rename from fs/cifs/fscache.c
rename to fs/smbfs/fscache.c
index fab47fa7df74..8eedd20c44ab 100644
--- a/fs/cifs/fscache.c
+++ b/fs/smbfs/fscache.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/fscache.c - CIFS filesystem cache interface
+ *   CIFS filesystem cache interface
  *
  *   Copyright (c) 2010 Novell, Inc.
  *   Author(s): Suresh Jayaraman <sjayaraman@suse.de>
diff --git a/fs/cifs/fscache.h b/fs/smbfs/fscache.h
similarity index 98%
rename from fs/cifs/fscache.h
rename to fs/smbfs/fscache.h
index 82e856b9cf89..9baa1d0f22bd 100644
--- a/fs/cifs/fscache.h
+++ b/fs/smbfs/fscache.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/fscache.h - CIFS filesystem cache interface definitions
+ *   CIFS filesystem cache interface definitions
  *
  *   Copyright (c) 2010 Novell, Inc.
  *   Authors(s): Suresh Jayaraman (sjayaraman@suse.de>
diff --git a/fs/cifs/inode.c b/fs/smbfs/inode.c
similarity index 99%
rename from fs/cifs/inode.c
rename to fs/smbfs/inode.c
index 50c01cff4c84..19af2d0ec8d5 100644
--- a/fs/cifs/inode.c
+++ b/fs/smbfs/inode.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/inode.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2010
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/ioctl.c b/fs/smbfs/ioctl.c
similarity index 99%
rename from fs/cifs/ioctl.c
rename to fs/smbfs/ioctl.c
index 42c6a0bac6c8..44ae99454fb3 100644
--- a/fs/cifs/ioctl.c
+++ b/fs/smbfs/ioctl.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/ioctl.c
  *
  *   vfs operations that deal with io control
  *
diff --git a/fs/cifs/link.c b/fs/smbfs/link.c
similarity index 99%
rename from fs/cifs/link.c
rename to fs/smbfs/link.c
index f0a6d63bc08c..852e54ee82c2 100644
--- a/fs/cifs/link.c
+++ b/fs/smbfs/link.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/link.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/misc.c b/fs/smbfs/misc.c
similarity index 99%
rename from fs/cifs/misc.c
rename to fs/smbfs/misc.c
index 9469f1cf0b46..f4313935e734 100644
--- a/fs/cifs/misc.c
+++ b/fs/smbfs/misc.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/misc.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/netlink.c b/fs/smbfs/netlink.c
similarity index 98%
rename from fs/cifs/netlink.c
rename to fs/smbfs/netlink.c
index 291cb606f149..5d98fca96422 100644
--- a/fs/cifs/netlink.c
+++ b/fs/smbfs/netlink.c
@@ -6,7 +6,7 @@
  */
 
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs/cifs_netlink.h>
 
 #include "netlink.h"
 #include "cifsglob.h"
diff --git a/fs/cifs/netlink.h b/fs/smbfs/netlink.h
similarity index 100%
rename from fs/cifs/netlink.h
rename to fs/smbfs/netlink.h
diff --git a/fs/cifs/netmisc.c b/fs/smbfs/netmisc.c
similarity index 99%
rename from fs/cifs/netmisc.c
rename to fs/smbfs/netmisc.c
index 0e728aac67e9..fa9fbd6a819c 100644
--- a/fs/cifs/netmisc.c
+++ b/fs/smbfs/netmisc.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- *   fs/cifs/netmisc.c
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/nterr.c b/fs/smbfs/nterr.c
similarity index 100%
rename from fs/cifs/nterr.c
rename to fs/smbfs/nterr.c
diff --git a/fs/cifs/nterr.h b/fs/smbfs/nterr.h
similarity index 100%
rename from fs/cifs/nterr.h
rename to fs/smbfs/nterr.h
diff --git a/fs/cifs/ntlmssp.h b/fs/smbfs/ntlmssp.h
similarity index 99%
rename from fs/cifs/ntlmssp.h
rename to fs/smbfs/ntlmssp.h
index 378133ce8869..25a2b8ef88b9 100644
--- a/fs/cifs/ntlmssp.h
+++ b/fs/smbfs/ntlmssp.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/ntlmssp.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/readdir.c b/fs/smbfs/readdir.c
similarity index 99%
rename from fs/cifs/readdir.c
rename to fs/smbfs/readdir.c
index 54d77c99e21c..1929e80c09ee 100644
--- a/fs/cifs/readdir.c
+++ b/fs/smbfs/readdir.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/readdir.c
  *
  *   Directory search handling
  *
diff --git a/fs/cifs/rfc1002pdu.h b/fs/smbfs/rfc1002pdu.h
similarity index 98%
rename from fs/cifs/rfc1002pdu.h
rename to fs/smbfs/rfc1002pdu.h
index 137f7c95afd6..ae1d025da294 100644
--- a/fs/cifs/rfc1002pdu.h
+++ b/fs/smbfs/rfc1002pdu.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/rfc1002pdu.h
  *
  *   Protocol Data Unit definitions for RFC 1001/1002 support
  *
diff --git a/fs/cifs/sess.c b/fs/smbfs/sess.c
similarity index 99%
rename from fs/cifs/sess.c
rename to fs/smbfs/sess.c
index 118403fbeda2..23e02db7923f 100644
--- a/fs/cifs/sess.c
+++ b/fs/smbfs/sess.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/sess.c
  *
  *   SMB/CIFS session setup handling routines
  *
diff --git a/fs/cifs/smb1ops.c b/fs/smbfs/smb1ops.c
similarity index 100%
rename from fs/cifs/smb1ops.c
rename to fs/smbfs/smb1ops.c
diff --git a/fs/cifs/smb2file.c b/fs/smbfs/smb2file.c
similarity index 99%
rename from fs/cifs/smb2file.c
rename to fs/smbfs/smb2file.c
index c9d8a50062b8..f5dcc4940b6d 100644
--- a/fs/cifs/smb2file.c
+++ b/fs/smbfs/smb2file.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/smb2file.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002, 2011
  *   Author(s): Steve French (sfrench@us.ibm.com),
diff --git a/fs/cifs/smb2glob.h b/fs/smbfs/smb2glob.h
similarity index 98%
rename from fs/cifs/smb2glob.h
rename to fs/smbfs/smb2glob.h
index d0e9f3782bd9..ca692b2283cd 100644
--- a/fs/cifs/smb2glob.h
+++ b/fs/smbfs/smb2glob.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/smb2glob.h
  *
  *   Definitions for various global variables and structures
  *
diff --git a/fs/cifs/smb2inode.c b/fs/smbfs/smb2inode.c
similarity index 99%
rename from fs/cifs/smb2inode.c
rename to fs/smbfs/smb2inode.c
index 957b2594f02e..8297703492ee 100644
--- a/fs/cifs/smb2inode.c
+++ b/fs/smbfs/smb2inode.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/smb2inode.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002, 2011
  *                 Etersoft, 2012
diff --git a/fs/cifs/smb2maperror.c b/fs/smbfs/smb2maperror.c
similarity index 100%
rename from fs/cifs/smb2maperror.c
rename to fs/smbfs/smb2maperror.c
diff --git a/fs/cifs/smb2misc.c b/fs/smbfs/smb2misc.c
similarity index 99%
rename from fs/cifs/smb2misc.c
rename to fs/smbfs/smb2misc.c
index 668f77108831..29b5554f6263 100644
--- a/fs/cifs/smb2misc.c
+++ b/fs/smbfs/smb2misc.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/smb2misc.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2011
  *                 Etersoft, 2012
diff --git a/fs/cifs/smb2ops.c b/fs/smbfs/smb2ops.c
similarity index 100%
rename from fs/cifs/smb2ops.c
rename to fs/smbfs/smb2ops.c
diff --git a/fs/cifs/smb2pdu.c b/fs/smbfs/smb2pdu.c
similarity index 99%
rename from fs/cifs/smb2pdu.c
rename to fs/smbfs/smb2pdu.c
index b6d2e3591927..672ae78e866a 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/smbfs/smb2pdu.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/smb2pdu.c
  *
  *   Copyright (C) International Business Machines  Corp., 2009, 2013
  *                 Etersoft, 2012
diff --git a/fs/cifs/smb2pdu.h b/fs/smbfs/smb2pdu.h
similarity index 99%
rename from fs/cifs/smb2pdu.h
rename to fs/smbfs/smb2pdu.h
index e9cac7970b66..f32c99c9ba13 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/smbfs/smb2pdu.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/smb2pdu.h
  *
  *   Copyright (c) International Business Machines  Corp., 2009, 2013
  *                 Etersoft, 2012
diff --git a/fs/cifs/smb2proto.h b/fs/smbfs/smb2proto.h
similarity index 99%
rename from fs/cifs/smb2proto.h
rename to fs/smbfs/smb2proto.h
index 263767f644f8..547945443fa7 100644
--- a/fs/cifs/smb2proto.h
+++ b/fs/smbfs/smb2proto.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/smb2proto.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002, 2011
  *                 Etersoft, 2012
diff --git a/fs/cifs/smb2status.h b/fs/smbfs/smb2status.h
similarity index 99%
rename from fs/cifs/smb2status.h
rename to fs/smbfs/smb2status.h
index 0215ef36e240..a9e958166fc5 100644
--- a/fs/cifs/smb2status.h
+++ b/fs/smbfs/smb2status.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/smb2status.h
  *
  *   SMB2 Status code (network error) definitions
  *   Definitions are from MS-ERREF
diff --git a/fs/cifs/smb2transport.c b/fs/smbfs/smb2transport.c
similarity index 99%
rename from fs/cifs/smb2transport.c
rename to fs/smbfs/smb2transport.c
index 6f7952ea4941..f59b956f9d25 100644
--- a/fs/cifs/smb2transport.c
+++ b/fs/smbfs/smb2transport.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/smb2transport.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002, 2011
  *                 Etersoft, 2012
diff --git a/fs/cifs/smbdirect.c b/fs/smbfs/smbdirect.c
similarity index 100%
rename from fs/cifs/smbdirect.c
rename to fs/smbfs/smbdirect.c
diff --git a/fs/cifs/smbdirect.h b/fs/smbfs/smbdirect.h
similarity index 100%
rename from fs/cifs/smbdirect.h
rename to fs/smbfs/smbdirect.h
diff --git a/fs/cifs/smbencrypt.c b/fs/smbfs/smbencrypt.c
similarity index 100%
rename from fs/cifs/smbencrypt.c
rename to fs/smbfs/smbencrypt.c
diff --git a/fs/cifs/smberr.h b/fs/smbfs/smberr.h
similarity index 99%
rename from fs/cifs/smberr.h
rename to fs/smbfs/smberr.h
index 60189efb3236..aeffdad829e2 100644
--- a/fs/cifs/smberr.h
+++ b/fs/smbfs/smberr.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1 */
 /*
- *   fs/cifs/smberr.h
  *
  *   Copyright (c) International Business Machines  Corp., 2002,2004
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/trace.c b/fs/smbfs/trace.c
similarity index 100%
rename from fs/cifs/trace.c
rename to fs/smbfs/trace.c
diff --git a/fs/cifs/trace.h b/fs/smbfs/trace.h
similarity index 100%
rename from fs/cifs/trace.h
rename to fs/smbfs/trace.h
diff --git a/fs/cifs/transport.c b/fs/smbfs/transport.c
similarity index 99%
rename from fs/cifs/transport.c
rename to fs/smbfs/transport.c
index 75a95de320cf..b7379329b741 100644
--- a/fs/cifs/transport.c
+++ b/fs/smbfs/transport.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/transport.c
  *
  *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/fs/cifs/unc.c b/fs/smbfs/unc.c
similarity index 100%
rename from fs/cifs/unc.c
rename to fs/smbfs/unc.c
diff --git a/fs/cifs/winucase.c b/fs/smbfs/winucase.c
similarity index 99%
rename from fs/cifs/winucase.c
rename to fs/smbfs/winucase.c
index 59b6c577aa0a..2f075b5b50df 100644
--- a/fs/cifs/winucase.c
+++ b/fs/smbfs/winucase.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * fs/cifs/winucase.c
  *
  * Copyright (c) Jeffrey Layton <jlayton@redhat.com>, 2013
  *
diff --git a/fs/cifs/xattr.c b/fs/smbfs/xattr.c
similarity index 99%
rename from fs/cifs/xattr.c
rename to fs/smbfs/xattr.c
index 9ed481e79ce0..7d8b72d67c80 100644
--- a/fs/cifs/xattr.c
+++ b/fs/smbfs/xattr.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1
 /*
- *   fs/cifs/xattr.c
  *
  *   Copyright (c) International Business Machines  Corp., 2003, 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/smbfs/cifs_mount.h
similarity index 96%
rename from include/uapi/linux/cifs/cifs_mount.h
rename to include/uapi/linux/smbfs/cifs_mount.h
index 69829205fdb5..8e87d27b0951 100644
--- a/include/uapi/linux/cifs/cifs_mount.h
+++ b/include/uapi/linux/smbfs/cifs_mount.h
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
 /*
- *   include/uapi/linux/cifs/cifs_mount.h
  *
  *   Author(s): Scott Lovenberg (scott.lovenberg@gmail.com)
  *
diff --git a/include/uapi/linux/cifs/cifs_netlink.h b/include/uapi/linux/smbfs/cifs_netlink.h
similarity index 100%
rename from include/uapi/linux/cifs/cifs_netlink.h
rename to include/uapi/linux/smbfs/cifs_netlink.h
-- 
2.30.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: cifs: rename fs/cifs directory to fs/smbfs
  2021-09-13  5:16 cifs: rename fs/cifs directory to fs/smbfs Steve French
@ 2021-09-14  5:27 ` Steve French
  0 siblings, 0 replies; 2+ messages in thread
From: Steve French @ 2021-09-14  5:27 UTC (permalink / raw)
  To: CIFS; +Cc: Namjae Jeon, ronnie sahlberg

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

Updated version of the patch (smaller now since the SPDX changes were
done in the previous patch), and split into
two patches to separate out the renaming of the uapi include directory
for cifs..  See attached.

Rename the smb3/cifs client directory:
        fs/cifs ---> fs/smbfs_client

(and the corresponding include/uapi/linux/cifs --->
include/uapi/linux/smbfs_client)

The original idea of renaming to fs/smbfs could have confused the
history due to conflicts with an earlier directory of the same name,
so use the directory name smbfs_client (this also fits better with the
relatively new fs/smbfs_common directory for the shared client/server
files).

On Mon, Sep 13, 2021 at 12:16 AM Steve French <smfrench@gmail.com> wrote:
>
> To be more consistent with the source directory name for the
> new smb3 server (ksmbd), and to avoid using the word "cifs"
> (a very old dialect) when more recent dialects (like SMB3 or
> SMB3.1.1) are meant, rename the client directory from
> fs/cifs to fs/smbfs. It is already possible to do
> "modprobe smb3" or "mount -t smb3 ..."
>
> Note that this does not rename the module itself (cifs.ko)
> although that could be done in a future patch.
>
> --
> Thanks,
>
> Steve



-- 
Thanks,

Steve

[-- Attachment #2: 0001-cifs-rename-fs-cifs-directory-to-fs-smbfs_client.patch --]
[-- Type: text/x-patch, Size: 26192 bytes --]

From b4a8c8f8fa8b7b86bb62257fbb27e7bde58ac97e Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 14 Sep 2021 00:05:24 -0500
Subject: [PATCH] cifs: rename fs/cifs directory to fs/smbfs_client

To be more consistent with the source directory name for the
new smb3 server (ksmbd), and to avoid using the word "cifs"
(a very old dialect) when more recent dialects (like SMB3 or
SMB3.1.1) are meant, rename the client directory from
fs/cifs to fs/smbfs_client. It is already possible to do
"modprobe smb3" or "mount -t smb3 ..."

Note that this does not rename the module itself (cifs.ko)
although that could be done in a future patch.

Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 Documentation/admin-guide/cifs/changes.rst         |  2 +-
 Documentation/admin-guide/cifs/usage.rst           | 14 +++++++-------
 Documentation/filesystems/cifs/cifsroot.rst        |  2 +-
 Documentation/userspace-api/ioctl/ioctl-number.rst |  2 +-
 MAINTAINERS                                        |  4 ++--
 fs/Kconfig                                         |  2 +-
 fs/Makefile                                        |  2 +-
 fs/{cifs => smbfs_client}/Kconfig                  |  0
 fs/{cifs => smbfs_client}/Makefile                 |  0
 fs/{cifs => smbfs_client}/asn1.c                   |  0
 fs/{cifs => smbfs_client}/cache.c                  |  0
 fs/{cifs => smbfs_client}/cifs_debug.c             |  0
 fs/{cifs => smbfs_client}/cifs_debug.h             |  0
 fs/{cifs => smbfs_client}/cifs_dfs_ref.c           |  0
 fs/{cifs => smbfs_client}/cifs_fs_sb.h             |  0
 fs/{cifs => smbfs_client}/cifs_ioctl.h             |  0
 fs/{cifs => smbfs_client}/cifs_spnego.c            |  0
 fs/{cifs => smbfs_client}/cifs_spnego.h            |  0
 .../cifs_spnego_negtokeninit.asn1                  |  0
 fs/{cifs => smbfs_client}/cifs_swn.c               |  0
 fs/{cifs => smbfs_client}/cifs_swn.h               |  0
 fs/{cifs => smbfs_client}/cifs_unicode.c           |  0
 fs/{cifs => smbfs_client}/cifs_unicode.h           |  0
 fs/{cifs => smbfs_client}/cifs_uniupr.h            |  0
 fs/{cifs => smbfs_client}/cifsacl.c                |  0
 fs/{cifs => smbfs_client}/cifsacl.h                |  0
 fs/{cifs => smbfs_client}/cifsencrypt.c            |  0
 fs/{cifs => smbfs_client}/cifsfs.c                 |  0
 fs/{cifs => smbfs_client}/cifsfs.h                 |  0
 fs/{cifs => smbfs_client}/cifsglob.h               |  0
 fs/{cifs => smbfs_client}/cifspdu.h                |  0
 fs/{cifs => smbfs_client}/cifsproto.h              |  0
 fs/{cifs => smbfs_client}/cifsroot.c               |  0
 fs/{cifs => smbfs_client}/cifssmb.c                |  0
 fs/{cifs => smbfs_client}/connect.c                |  0
 fs/{cifs => smbfs_client}/dfs_cache.c              |  0
 fs/{cifs => smbfs_client}/dfs_cache.h              |  0
 fs/{cifs => smbfs_client}/dir.c                    |  0
 fs/{cifs => smbfs_client}/dns_resolve.c            |  0
 fs/{cifs => smbfs_client}/dns_resolve.h            |  0
 fs/{cifs => smbfs_client}/export.c                 |  0
 fs/{cifs => smbfs_client}/file.c                   |  0
 fs/{cifs => smbfs_client}/fs_context.c             |  0
 fs/{cifs => smbfs_client}/fs_context.h             |  0
 fs/{cifs => smbfs_client}/fscache.c                |  0
 fs/{cifs => smbfs_client}/fscache.h                |  0
 fs/{cifs => smbfs_client}/inode.c                  |  0
 fs/{cifs => smbfs_client}/ioctl.c                  |  0
 fs/{cifs => smbfs_client}/link.c                   |  0
 fs/{cifs => smbfs_client}/misc.c                   |  0
 fs/{cifs => smbfs_client}/netlink.c                |  0
 fs/{cifs => smbfs_client}/netlink.h                |  0
 fs/{cifs => smbfs_client}/netmisc.c                |  0
 fs/{cifs => smbfs_client}/nterr.c                  |  0
 fs/{cifs => smbfs_client}/nterr.h                  |  0
 fs/{cifs => smbfs_client}/ntlmssp.h                |  0
 fs/{cifs => smbfs_client}/readdir.c                |  0
 fs/{cifs => smbfs_client}/rfc1002pdu.h             |  0
 fs/{cifs => smbfs_client}/sess.c                   |  0
 fs/{cifs => smbfs_client}/smb1ops.c                |  0
 fs/{cifs => smbfs_client}/smb2file.c               |  0
 fs/{cifs => smbfs_client}/smb2glob.h               |  0
 fs/{cifs => smbfs_client}/smb2inode.c              |  0
 fs/{cifs => smbfs_client}/smb2maperror.c           |  0
 fs/{cifs => smbfs_client}/smb2misc.c               |  0
 fs/{cifs => smbfs_client}/smb2ops.c                |  0
 fs/{cifs => smbfs_client}/smb2pdu.c                |  0
 fs/{cifs => smbfs_client}/smb2pdu.h                |  0
 fs/{cifs => smbfs_client}/smb2proto.h              |  0
 fs/{cifs => smbfs_client}/smb2status.h             |  0
 fs/{cifs => smbfs_client}/smb2transport.c          |  0
 fs/{cifs => smbfs_client}/smbdirect.c              |  0
 fs/{cifs => smbfs_client}/smbdirect.h              |  0
 fs/{cifs => smbfs_client}/smbencrypt.c             |  0
 fs/{cifs => smbfs_client}/smberr.h                 |  0
 fs/{cifs => smbfs_client}/trace.c                  |  0
 fs/{cifs => smbfs_client}/trace.h                  |  0
 fs/{cifs => smbfs_client}/transport.c              |  0
 fs/{cifs => smbfs_client}/unc.c                    |  0
 fs/{cifs => smbfs_client}/winucase.c               |  0
 fs/{cifs => smbfs_client}/xattr.c                  |  0
 81 files changed, 14 insertions(+), 14 deletions(-)
 rename fs/{cifs => smbfs_client}/Kconfig (100%)
 rename fs/{cifs => smbfs_client}/Makefile (100%)
 rename fs/{cifs => smbfs_client}/asn1.c (100%)
 rename fs/{cifs => smbfs_client}/cache.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_debug.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_debug.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_dfs_ref.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_fs_sb.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_ioctl.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_spnego.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_spnego.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_spnego_negtokeninit.asn1 (100%)
 rename fs/{cifs => smbfs_client}/cifs_swn.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_swn.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_unicode.c (100%)
 rename fs/{cifs => smbfs_client}/cifs_unicode.h (100%)
 rename fs/{cifs => smbfs_client}/cifs_uniupr.h (100%)
 rename fs/{cifs => smbfs_client}/cifsacl.c (100%)
 rename fs/{cifs => smbfs_client}/cifsacl.h (100%)
 rename fs/{cifs => smbfs_client}/cifsencrypt.c (100%)
 rename fs/{cifs => smbfs_client}/cifsfs.c (100%)
 rename fs/{cifs => smbfs_client}/cifsfs.h (100%)
 rename fs/{cifs => smbfs_client}/cifsglob.h (100%)
 rename fs/{cifs => smbfs_client}/cifspdu.h (100%)
 rename fs/{cifs => smbfs_client}/cifsproto.h (100%)
 rename fs/{cifs => smbfs_client}/cifsroot.c (100%)
 rename fs/{cifs => smbfs_client}/cifssmb.c (100%)
 rename fs/{cifs => smbfs_client}/connect.c (100%)
 rename fs/{cifs => smbfs_client}/dfs_cache.c (100%)
 rename fs/{cifs => smbfs_client}/dfs_cache.h (100%)
 rename fs/{cifs => smbfs_client}/dir.c (100%)
 rename fs/{cifs => smbfs_client}/dns_resolve.c (100%)
 rename fs/{cifs => smbfs_client}/dns_resolve.h (100%)
 rename fs/{cifs => smbfs_client}/export.c (100%)
 rename fs/{cifs => smbfs_client}/file.c (100%)
 rename fs/{cifs => smbfs_client}/fs_context.c (100%)
 rename fs/{cifs => smbfs_client}/fs_context.h (100%)
 rename fs/{cifs => smbfs_client}/fscache.c (100%)
 rename fs/{cifs => smbfs_client}/fscache.h (100%)
 rename fs/{cifs => smbfs_client}/inode.c (100%)
 rename fs/{cifs => smbfs_client}/ioctl.c (100%)
 rename fs/{cifs => smbfs_client}/link.c (100%)
 rename fs/{cifs => smbfs_client}/misc.c (100%)
 rename fs/{cifs => smbfs_client}/netlink.c (100%)
 rename fs/{cifs => smbfs_client}/netlink.h (100%)
 rename fs/{cifs => smbfs_client}/netmisc.c (100%)
 rename fs/{cifs => smbfs_client}/nterr.c (100%)
 rename fs/{cifs => smbfs_client}/nterr.h (100%)
 rename fs/{cifs => smbfs_client}/ntlmssp.h (100%)
 rename fs/{cifs => smbfs_client}/readdir.c (100%)
 rename fs/{cifs => smbfs_client}/rfc1002pdu.h (100%)
 rename fs/{cifs => smbfs_client}/sess.c (100%)
 rename fs/{cifs => smbfs_client}/smb1ops.c (100%)
 rename fs/{cifs => smbfs_client}/smb2file.c (100%)
 rename fs/{cifs => smbfs_client}/smb2glob.h (100%)
 rename fs/{cifs => smbfs_client}/smb2inode.c (100%)
 rename fs/{cifs => smbfs_client}/smb2maperror.c (100%)
 rename fs/{cifs => smbfs_client}/smb2misc.c (100%)
 rename fs/{cifs => smbfs_client}/smb2ops.c (100%)
 rename fs/{cifs => smbfs_client}/smb2pdu.c (100%)
 rename fs/{cifs => smbfs_client}/smb2pdu.h (100%)
 rename fs/{cifs => smbfs_client}/smb2proto.h (100%)
 rename fs/{cifs => smbfs_client}/smb2status.h (100%)
 rename fs/{cifs => smbfs_client}/smb2transport.c (100%)
 rename fs/{cifs => smbfs_client}/smbdirect.c (100%)
 rename fs/{cifs => smbfs_client}/smbdirect.h (100%)
 rename fs/{cifs => smbfs_client}/smbencrypt.c (100%)
 rename fs/{cifs => smbfs_client}/smberr.h (100%)
 rename fs/{cifs => smbfs_client}/trace.c (100%)
 rename fs/{cifs => smbfs_client}/trace.h (100%)
 rename fs/{cifs => smbfs_client}/transport.c (100%)
 rename fs/{cifs => smbfs_client}/unc.c (100%)
 rename fs/{cifs => smbfs_client}/winucase.c (100%)
 rename fs/{cifs => smbfs_client}/xattr.c (100%)

diff --git a/Documentation/admin-guide/cifs/changes.rst b/Documentation/admin-guide/cifs/changes.rst
index 3147bbae9c43..ea4d9269237c 100644
--- a/Documentation/admin-guide/cifs/changes.rst
+++ b/Documentation/admin-guide/cifs/changes.rst
@@ -5,5 +5,5 @@ Changes
 See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary
 information about fixes/improvements to CIFS/SMB2/SMB3 support (changes
 to cifs.ko module) by kernel version (and cifs internal module version).
-This may be easier to read than parsing the output of "git log fs/cifs"
+This may be easier to read than parsing the output of "git log fs/smbfs_client"
 by release.
diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst
index f170d8820258..7b096a7823d2 100644
--- a/Documentation/admin-guide/cifs/usage.rst
+++ b/Documentation/admin-guide/cifs/usage.rst
@@ -45,7 +45,7 @@ Installation instructions
 
 If you have built the CIFS vfs as module (successfully) simply
 type ``make modules_install`` (or if you prefer, manually copy the file to
-the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).
+the modules directory e.g. /lib/modules/5.10.0+/kernel/fs/smbfs_client/cifs.ko).
 
 If you have built the CIFS vfs into the kernel itself, follow the instructions
 for your distribution on how to install a new kernel (usually you
@@ -66,22 +66,22 @@ If cifs is built as a module, then the size and number of network buffers
 and maximum number of simultaneous requests to one server can be configured.
 Changing these from their defaults is not recommended. By executing modinfo::
 
-	modinfo kernel/fs/cifs/cifs.ko
+	modinfo kernel/fs/smbfs_client/cifs.ko
 
-on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made
-at module initialization time (by running insmod cifs.ko) can be seen.
+on kernel/fs/smbfs_client/cifs.ko the list of configuration changes that can be
+made at module initialization time (by running insmod cifs.ko) can be seen.
 
 Recommendations
 ===============
 
-To improve security the SMB2.1 dialect or later (usually will get SMB3) is now
-the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"
+To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is
+now the default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"
 on mount (or vers=2.0 for Windows Vista).  Note that the CIFS (vers=1.0) is
 much older and less secure than the default dialect SMB3 which includes
 many advanced security features such as downgrade attack detection
 and encrypted shares and stronger signing and authentication algorithms.
 There are additional mount options that may be helpful for SMB3 to get
-improved POSIX behavior (NB: can use vers=3.0 to force only SMB3, never 2.1):
+improved POSIX behavior (NB: can use vers=3 to force only SMB3, never 2.1):
 
    ``mfsymlinks`` and either ``cifsacl`` or ``modefromsid`` (usually with ``idsfromsid``)
 
diff --git a/Documentation/filesystems/cifs/cifsroot.rst b/Documentation/filesystems/cifs/cifsroot.rst
index 4930bb443134..b1329d1a6f25 100644
--- a/Documentation/filesystems/cifs/cifsroot.rst
+++ b/Documentation/filesystems/cifs/cifsroot.rst
@@ -59,7 +59,7 @@ the root file system via SMB protocol.
 Enables the kernel to mount the root file system via SMB that are
 located in the <server-ip> and <share> specified in this option.
 
-The default mount options are set in fs/cifs/cifsroot.c.
+The default mount options are set in fs/smbfs_client/cifsroot.c.
 
 server-ip
 	IPv4 address of the server.
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
index 2e8134059c87..2dc93cab0d30 100644
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -359,7 +359,7 @@ Code  Seq#    Include File                                           Comments
 0xCC  00-0F  drivers/misc/ibmvmc.h                                   pseries VMC driver
 0xCD  01     linux/reiserfs_fs.h
 0xCE  01-02  uapi/linux/cxl_mem.h                                    Compute Express Link Memory Devices
-0xCF  02     fs/cifs/ioctl.c
+0xCF  02     fs/smbfs_client/ioctl.c
 0xDB  00-0F  drivers/char/mwave/mwavepub.h
 0xDD  00-3F                                                          ZFCP device driver see drivers/s390/scsi/
                                                                      <mailto:aherrman@de.ibm.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index eeb4c70b3d5b..8f5bee177496 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4655,8 +4655,8 @@ S:	Supported
 W:	http://linux-cifs.samba.org/
 T:	git git://git.samba.org/sfrench/cifs-2.6.git
 F:	Documentation/admin-guide/cifs/
-F:	fs/cifs/
-F:	fs/cifs_common/
+F:	fs/smbfs_client/
+F:	fs/smbfs_common/
 
 COMPACTPCI HOTPLUG CORE
 M:	Scott Murray <scott@spiteful.org>
diff --git a/fs/Kconfig b/fs/Kconfig
index a6313a969bc5..847d81b200ee 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -364,7 +364,7 @@ config NFS_V4_2_SSC_HELPER
 source "net/sunrpc/Kconfig"
 source "fs/ceph/Kconfig"
 
-source "fs/cifs/Kconfig"
+source "fs/smbfs_client/Kconfig"
 source "fs/ksmbd/Kconfig"
 
 config SMBFS_COMMON
diff --git a/fs/Makefile b/fs/Makefile
index 84c5e4cdfee5..67362a7e5b84 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -97,7 +97,7 @@ obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_UNICODE)		+= unicode/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_SMBFS_COMMON)	+= smbfs_common/
-obj-$(CONFIG_CIFS)		+= cifs/
+obj-$(CONFIG_CIFS)		+= smbfs_client/
 obj-$(CONFIG_SMB_SERVER)	+= ksmbd/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
diff --git a/fs/cifs/Kconfig b/fs/smbfs_client/Kconfig
similarity index 100%
rename from fs/cifs/Kconfig
rename to fs/smbfs_client/Kconfig
diff --git a/fs/cifs/Makefile b/fs/smbfs_client/Makefile
similarity index 100%
rename from fs/cifs/Makefile
rename to fs/smbfs_client/Makefile
diff --git a/fs/cifs/asn1.c b/fs/smbfs_client/asn1.c
similarity index 100%
rename from fs/cifs/asn1.c
rename to fs/smbfs_client/asn1.c
diff --git a/fs/cifs/cache.c b/fs/smbfs_client/cache.c
similarity index 100%
rename from fs/cifs/cache.c
rename to fs/smbfs_client/cache.c
diff --git a/fs/cifs/cifs_debug.c b/fs/smbfs_client/cifs_debug.c
similarity index 100%
rename from fs/cifs/cifs_debug.c
rename to fs/smbfs_client/cifs_debug.c
diff --git a/fs/cifs/cifs_debug.h b/fs/smbfs_client/cifs_debug.h
similarity index 100%
rename from fs/cifs/cifs_debug.h
rename to fs/smbfs_client/cifs_debug.h
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/smbfs_client/cifs_dfs_ref.c
similarity index 100%
rename from fs/cifs/cifs_dfs_ref.c
rename to fs/smbfs_client/cifs_dfs_ref.c
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/smbfs_client/cifs_fs_sb.h
similarity index 100%
rename from fs/cifs/cifs_fs_sb.h
rename to fs/smbfs_client/cifs_fs_sb.h
diff --git a/fs/cifs/cifs_ioctl.h b/fs/smbfs_client/cifs_ioctl.h
similarity index 100%
rename from fs/cifs/cifs_ioctl.h
rename to fs/smbfs_client/cifs_ioctl.h
diff --git a/fs/cifs/cifs_spnego.c b/fs/smbfs_client/cifs_spnego.c
similarity index 100%
rename from fs/cifs/cifs_spnego.c
rename to fs/smbfs_client/cifs_spnego.c
diff --git a/fs/cifs/cifs_spnego.h b/fs/smbfs_client/cifs_spnego.h
similarity index 100%
rename from fs/cifs/cifs_spnego.h
rename to fs/smbfs_client/cifs_spnego.h
diff --git a/fs/cifs/cifs_spnego_negtokeninit.asn1 b/fs/smbfs_client/cifs_spnego_negtokeninit.asn1
similarity index 100%
rename from fs/cifs/cifs_spnego_negtokeninit.asn1
rename to fs/smbfs_client/cifs_spnego_negtokeninit.asn1
diff --git a/fs/cifs/cifs_swn.c b/fs/smbfs_client/cifs_swn.c
similarity index 100%
rename from fs/cifs/cifs_swn.c
rename to fs/smbfs_client/cifs_swn.c
diff --git a/fs/cifs/cifs_swn.h b/fs/smbfs_client/cifs_swn.h
similarity index 100%
rename from fs/cifs/cifs_swn.h
rename to fs/smbfs_client/cifs_swn.h
diff --git a/fs/cifs/cifs_unicode.c b/fs/smbfs_client/cifs_unicode.c
similarity index 100%
rename from fs/cifs/cifs_unicode.c
rename to fs/smbfs_client/cifs_unicode.c
diff --git a/fs/cifs/cifs_unicode.h b/fs/smbfs_client/cifs_unicode.h
similarity index 100%
rename from fs/cifs/cifs_unicode.h
rename to fs/smbfs_client/cifs_unicode.h
diff --git a/fs/cifs/cifs_uniupr.h b/fs/smbfs_client/cifs_uniupr.h
similarity index 100%
rename from fs/cifs/cifs_uniupr.h
rename to fs/smbfs_client/cifs_uniupr.h
diff --git a/fs/cifs/cifsacl.c b/fs/smbfs_client/cifsacl.c
similarity index 100%
rename from fs/cifs/cifsacl.c
rename to fs/smbfs_client/cifsacl.c
diff --git a/fs/cifs/cifsacl.h b/fs/smbfs_client/cifsacl.h
similarity index 100%
rename from fs/cifs/cifsacl.h
rename to fs/smbfs_client/cifsacl.h
diff --git a/fs/cifs/cifsencrypt.c b/fs/smbfs_client/cifsencrypt.c
similarity index 100%
rename from fs/cifs/cifsencrypt.c
rename to fs/smbfs_client/cifsencrypt.c
diff --git a/fs/cifs/cifsfs.c b/fs/smbfs_client/cifsfs.c
similarity index 100%
rename from fs/cifs/cifsfs.c
rename to fs/smbfs_client/cifsfs.c
diff --git a/fs/cifs/cifsfs.h b/fs/smbfs_client/cifsfs.h
similarity index 100%
rename from fs/cifs/cifsfs.h
rename to fs/smbfs_client/cifsfs.h
diff --git a/fs/cifs/cifsglob.h b/fs/smbfs_client/cifsglob.h
similarity index 100%
rename from fs/cifs/cifsglob.h
rename to fs/smbfs_client/cifsglob.h
diff --git a/fs/cifs/cifspdu.h b/fs/smbfs_client/cifspdu.h
similarity index 100%
rename from fs/cifs/cifspdu.h
rename to fs/smbfs_client/cifspdu.h
diff --git a/fs/cifs/cifsproto.h b/fs/smbfs_client/cifsproto.h
similarity index 100%
rename from fs/cifs/cifsproto.h
rename to fs/smbfs_client/cifsproto.h
diff --git a/fs/cifs/cifsroot.c b/fs/smbfs_client/cifsroot.c
similarity index 100%
rename from fs/cifs/cifsroot.c
rename to fs/smbfs_client/cifsroot.c
diff --git a/fs/cifs/cifssmb.c b/fs/smbfs_client/cifssmb.c
similarity index 100%
rename from fs/cifs/cifssmb.c
rename to fs/smbfs_client/cifssmb.c
diff --git a/fs/cifs/connect.c b/fs/smbfs_client/connect.c
similarity index 100%
rename from fs/cifs/connect.c
rename to fs/smbfs_client/connect.c
diff --git a/fs/cifs/dfs_cache.c b/fs/smbfs_client/dfs_cache.c
similarity index 100%
rename from fs/cifs/dfs_cache.c
rename to fs/smbfs_client/dfs_cache.c
diff --git a/fs/cifs/dfs_cache.h b/fs/smbfs_client/dfs_cache.h
similarity index 100%
rename from fs/cifs/dfs_cache.h
rename to fs/smbfs_client/dfs_cache.h
diff --git a/fs/cifs/dir.c b/fs/smbfs_client/dir.c
similarity index 100%
rename from fs/cifs/dir.c
rename to fs/smbfs_client/dir.c
diff --git a/fs/cifs/dns_resolve.c b/fs/smbfs_client/dns_resolve.c
similarity index 100%
rename from fs/cifs/dns_resolve.c
rename to fs/smbfs_client/dns_resolve.c
diff --git a/fs/cifs/dns_resolve.h b/fs/smbfs_client/dns_resolve.h
similarity index 100%
rename from fs/cifs/dns_resolve.h
rename to fs/smbfs_client/dns_resolve.h
diff --git a/fs/cifs/export.c b/fs/smbfs_client/export.c
similarity index 100%
rename from fs/cifs/export.c
rename to fs/smbfs_client/export.c
diff --git a/fs/cifs/file.c b/fs/smbfs_client/file.c
similarity index 100%
rename from fs/cifs/file.c
rename to fs/smbfs_client/file.c
diff --git a/fs/cifs/fs_context.c b/fs/smbfs_client/fs_context.c
similarity index 100%
rename from fs/cifs/fs_context.c
rename to fs/smbfs_client/fs_context.c
diff --git a/fs/cifs/fs_context.h b/fs/smbfs_client/fs_context.h
similarity index 100%
rename from fs/cifs/fs_context.h
rename to fs/smbfs_client/fs_context.h
diff --git a/fs/cifs/fscache.c b/fs/smbfs_client/fscache.c
similarity index 100%
rename from fs/cifs/fscache.c
rename to fs/smbfs_client/fscache.c
diff --git a/fs/cifs/fscache.h b/fs/smbfs_client/fscache.h
similarity index 100%
rename from fs/cifs/fscache.h
rename to fs/smbfs_client/fscache.h
diff --git a/fs/cifs/inode.c b/fs/smbfs_client/inode.c
similarity index 100%
rename from fs/cifs/inode.c
rename to fs/smbfs_client/inode.c
diff --git a/fs/cifs/ioctl.c b/fs/smbfs_client/ioctl.c
similarity index 100%
rename from fs/cifs/ioctl.c
rename to fs/smbfs_client/ioctl.c
diff --git a/fs/cifs/link.c b/fs/smbfs_client/link.c
similarity index 100%
rename from fs/cifs/link.c
rename to fs/smbfs_client/link.c
diff --git a/fs/cifs/misc.c b/fs/smbfs_client/misc.c
similarity index 100%
rename from fs/cifs/misc.c
rename to fs/smbfs_client/misc.c
diff --git a/fs/cifs/netlink.c b/fs/smbfs_client/netlink.c
similarity index 100%
rename from fs/cifs/netlink.c
rename to fs/smbfs_client/netlink.c
diff --git a/fs/cifs/netlink.h b/fs/smbfs_client/netlink.h
similarity index 100%
rename from fs/cifs/netlink.h
rename to fs/smbfs_client/netlink.h
diff --git a/fs/cifs/netmisc.c b/fs/smbfs_client/netmisc.c
similarity index 100%
rename from fs/cifs/netmisc.c
rename to fs/smbfs_client/netmisc.c
diff --git a/fs/cifs/nterr.c b/fs/smbfs_client/nterr.c
similarity index 100%
rename from fs/cifs/nterr.c
rename to fs/smbfs_client/nterr.c
diff --git a/fs/cifs/nterr.h b/fs/smbfs_client/nterr.h
similarity index 100%
rename from fs/cifs/nterr.h
rename to fs/smbfs_client/nterr.h
diff --git a/fs/cifs/ntlmssp.h b/fs/smbfs_client/ntlmssp.h
similarity index 100%
rename from fs/cifs/ntlmssp.h
rename to fs/smbfs_client/ntlmssp.h
diff --git a/fs/cifs/readdir.c b/fs/smbfs_client/readdir.c
similarity index 100%
rename from fs/cifs/readdir.c
rename to fs/smbfs_client/readdir.c
diff --git a/fs/cifs/rfc1002pdu.h b/fs/smbfs_client/rfc1002pdu.h
similarity index 100%
rename from fs/cifs/rfc1002pdu.h
rename to fs/smbfs_client/rfc1002pdu.h
diff --git a/fs/cifs/sess.c b/fs/smbfs_client/sess.c
similarity index 100%
rename from fs/cifs/sess.c
rename to fs/smbfs_client/sess.c
diff --git a/fs/cifs/smb1ops.c b/fs/smbfs_client/smb1ops.c
similarity index 100%
rename from fs/cifs/smb1ops.c
rename to fs/smbfs_client/smb1ops.c
diff --git a/fs/cifs/smb2file.c b/fs/smbfs_client/smb2file.c
similarity index 100%
rename from fs/cifs/smb2file.c
rename to fs/smbfs_client/smb2file.c
diff --git a/fs/cifs/smb2glob.h b/fs/smbfs_client/smb2glob.h
similarity index 100%
rename from fs/cifs/smb2glob.h
rename to fs/smbfs_client/smb2glob.h
diff --git a/fs/cifs/smb2inode.c b/fs/smbfs_client/smb2inode.c
similarity index 100%
rename from fs/cifs/smb2inode.c
rename to fs/smbfs_client/smb2inode.c
diff --git a/fs/cifs/smb2maperror.c b/fs/smbfs_client/smb2maperror.c
similarity index 100%
rename from fs/cifs/smb2maperror.c
rename to fs/smbfs_client/smb2maperror.c
diff --git a/fs/cifs/smb2misc.c b/fs/smbfs_client/smb2misc.c
similarity index 100%
rename from fs/cifs/smb2misc.c
rename to fs/smbfs_client/smb2misc.c
diff --git a/fs/cifs/smb2ops.c b/fs/smbfs_client/smb2ops.c
similarity index 100%
rename from fs/cifs/smb2ops.c
rename to fs/smbfs_client/smb2ops.c
diff --git a/fs/cifs/smb2pdu.c b/fs/smbfs_client/smb2pdu.c
similarity index 100%
rename from fs/cifs/smb2pdu.c
rename to fs/smbfs_client/smb2pdu.c
diff --git a/fs/cifs/smb2pdu.h b/fs/smbfs_client/smb2pdu.h
similarity index 100%
rename from fs/cifs/smb2pdu.h
rename to fs/smbfs_client/smb2pdu.h
diff --git a/fs/cifs/smb2proto.h b/fs/smbfs_client/smb2proto.h
similarity index 100%
rename from fs/cifs/smb2proto.h
rename to fs/smbfs_client/smb2proto.h
diff --git a/fs/cifs/smb2status.h b/fs/smbfs_client/smb2status.h
similarity index 100%
rename from fs/cifs/smb2status.h
rename to fs/smbfs_client/smb2status.h
diff --git a/fs/cifs/smb2transport.c b/fs/smbfs_client/smb2transport.c
similarity index 100%
rename from fs/cifs/smb2transport.c
rename to fs/smbfs_client/smb2transport.c
diff --git a/fs/cifs/smbdirect.c b/fs/smbfs_client/smbdirect.c
similarity index 100%
rename from fs/cifs/smbdirect.c
rename to fs/smbfs_client/smbdirect.c
diff --git a/fs/cifs/smbdirect.h b/fs/smbfs_client/smbdirect.h
similarity index 100%
rename from fs/cifs/smbdirect.h
rename to fs/smbfs_client/smbdirect.h
diff --git a/fs/cifs/smbencrypt.c b/fs/smbfs_client/smbencrypt.c
similarity index 100%
rename from fs/cifs/smbencrypt.c
rename to fs/smbfs_client/smbencrypt.c
diff --git a/fs/cifs/smberr.h b/fs/smbfs_client/smberr.h
similarity index 100%
rename from fs/cifs/smberr.h
rename to fs/smbfs_client/smberr.h
diff --git a/fs/cifs/trace.c b/fs/smbfs_client/trace.c
similarity index 100%
rename from fs/cifs/trace.c
rename to fs/smbfs_client/trace.c
diff --git a/fs/cifs/trace.h b/fs/smbfs_client/trace.h
similarity index 100%
rename from fs/cifs/trace.h
rename to fs/smbfs_client/trace.h
diff --git a/fs/cifs/transport.c b/fs/smbfs_client/transport.c
similarity index 100%
rename from fs/cifs/transport.c
rename to fs/smbfs_client/transport.c
diff --git a/fs/cifs/unc.c b/fs/smbfs_client/unc.c
similarity index 100%
rename from fs/cifs/unc.c
rename to fs/smbfs_client/unc.c
diff --git a/fs/cifs/winucase.c b/fs/smbfs_client/winucase.c
similarity index 100%
rename from fs/cifs/winucase.c
rename to fs/smbfs_client/winucase.c
diff --git a/fs/cifs/xattr.c b/fs/smbfs_client/xattr.c
similarity index 100%
rename from fs/cifs/xattr.c
rename to fs/smbfs_client/xattr.c
-- 
2.30.2


[-- Attachment #3: 0002-cifs-rename-uapi-linux-cifs-directory-to-uapi-linux-.patch --]
[-- Type: text/x-patch, Size: 2857 bytes --]

From c1abf13059571edd59d42d676ffe593fb987c019 Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@microsoft.com>
Date: Tue, 14 Sep 2021 00:22:02 -0500
Subject: [PATCH 2/2] cifs: rename uapi/linux/cifs directory to
 uapi/linux/smbfs_client

To be more consistent with the new source directory name for the
client ("fs/smbfs_client" instead of "fs/cifs"), and to avoid
using the word "cifs" (a very old dialect) when more recent
dialects (like SMB3 or SMB3.1.1) are meant, rename the cifs
include directory in uapi from cifs to smbfs_client

Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---
 fs/smbfs_client/cifs_swn.c                               | 2 +-
 fs/smbfs_client/cifsglob.h                               | 2 +-
 fs/smbfs_client/netlink.c                                | 2 +-
 include/uapi/linux/{cifs => smbfs_client}/cifs_mount.h   | 0
 include/uapi/linux/{cifs => smbfs_client}/cifs_netlink.h | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename include/uapi/linux/{cifs => smbfs_client}/cifs_mount.h (100%)
 rename include/uapi/linux/{cifs => smbfs_client}/cifs_netlink.h (100%)

diff --git a/fs/smbfs_client/cifs_swn.c b/fs/smbfs_client/cifs_swn.c
index 12bde7bfda86..0ad801a6a2e9 100644
--- a/fs/smbfs_client/cifs_swn.c
+++ b/fs/smbfs_client/cifs_swn.c
@@ -7,7 +7,7 @@
 
 #include <linux/kref.h>
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs_client/cifs_netlink.h>
 
 #include "cifs_swn.h"
 #include "cifsglob.h"
diff --git a/fs/smbfs_client/cifsglob.h b/fs/smbfs_client/cifsglob.h
index 7dd9878e26bf..1c7e5cdabb5a 100644
--- a/fs/smbfs_client/cifsglob.h
+++ b/fs/smbfs_client/cifsglob.h
@@ -19,7 +19,7 @@
 #include "cifsacl.h"
 #include <crypto/internal/hash.h>
 #include <linux/scatterlist.h>
-#include <uapi/linux/cifs/cifs_mount.h>
+#include <uapi/linux/smbfs_client/cifs_mount.h>
 #include "smb2pdu.h"
 
 #define CIFS_MAGIC_NUMBER 0xFF534D42      /* the first four bytes of SMB PDUs */
diff --git a/fs/smbfs_client/netlink.c b/fs/smbfs_client/netlink.c
index 291cb606f149..42ff5ed309d8 100644
--- a/fs/smbfs_client/netlink.c
+++ b/fs/smbfs_client/netlink.c
@@ -6,7 +6,7 @@
  */
 
 #include <net/genetlink.h>
-#include <uapi/linux/cifs/cifs_netlink.h>
+#include <uapi/linux/smbfs_client/cifs_netlink.h>
 
 #include "netlink.h"
 #include "cifsglob.h"
diff --git a/include/uapi/linux/cifs/cifs_mount.h b/include/uapi/linux/smbfs_client/cifs_mount.h
similarity index 100%
rename from include/uapi/linux/cifs/cifs_mount.h
rename to include/uapi/linux/smbfs_client/cifs_mount.h
diff --git a/include/uapi/linux/cifs/cifs_netlink.h b/include/uapi/linux/smbfs_client/cifs_netlink.h
similarity index 100%
rename from include/uapi/linux/cifs/cifs_netlink.h
rename to include/uapi/linux/smbfs_client/cifs_netlink.h
-- 
2.30.2


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-14  5:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13  5:16 cifs: rename fs/cifs directory to fs/smbfs Steve French
2021-09-14  5:27 ` Steve French

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).