ksmbd: move fs/cifsd to fs/ksmbd

Move fs/cifsd to fs/ksmbd and rename the remaining cifsd name to ksmbd. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]>
kungfuy · Jun 28, 2021 · 1a93084 · 1a93084
1 parent 131bac1
commit 1a93084
Show file tree

Hide file tree

Showing 63 changed files with 15 additions and 15 deletions.
diff --git a/Documentation/filesystems/cifs/index.rst b/Documentation/filesystems/cifs/index.rst
@@ -6,5 +6,5 @@ CIFS
 .. toctree::
    :maxdepth: 1
 
-   cifsd
+   ksmbd
    cifsroot
diff --git a/Documentation/filesystems/cifs/cifsd.rst → Documentation/filesystems/cifs/ksmbd.rst b/Documentation/filesystems/cifs/cifsd.rst → Documentation/filesystems/cifs/ksmbd.rst
@@ -1,13 +1,13 @@
 .. SPDX-License-Identifier: GPL-2.0
 
 ==========================
-CIFSD - SMB3 Kernel Server
+KSMBD - SMB3 Kernel Server
 ==========================
 
-CIFSD is a linux kernel server which implements SMB3 protocol in kernel space
+KSMBD is a linux kernel server which implements SMB3 protocol in kernel space
 for sharing files over network.
 
-CIFSD architecture
+KSMBD architecture
 ==================
 
 The subset of performance related operations belong in kernelspace and
@@ -60,7 +60,7 @@ NetServerGetInfo. Complete DCE/RPC response is prepared from the user space
 and passed over to the associated kernel thread for the client.
 
 
-CIFSD Feature Status
+KSMBD Feature Status
 ====================
 
 ============================== =================================================
@@ -138,7 +138,7 @@ How to run
 
 6. Access share from Windows or Linux using CIFS
 
-Shutdown CIFSD
+Shutdown KSMBD
 ==============
 
 1. kill user and kernel space daemon

diff --git a/fs/Kconfig b/fs/Kconfig
@@ -344,7 +344,7 @@ config NFS_V4_2_SSC_HELPER
 source "net/sunrpc/Kconfig"
 source "fs/ceph/Kconfig"
 source "fs/cifs/Kconfig"
-source "fs/cifsd/Kconfig"
+source "fs/ksmbd/Kconfig"
 source "fs/coda/Kconfig"
 source "fs/afs/Kconfig"
 source "fs/9p/Kconfig"

diff --git a/fs/Makefile b/fs/Makefile
@@ -98,7 +98,7 @@ obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_UNICODE)		+= unicode/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_CIFS)		+= cifs/
-obj-$(CONFIG_SMB_SERVER)	+= cifsd/
+obj-$(CONFIG_SMB_SERVER)	+= ksmbd/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
 obj-$(CONFIG_UFS_FS)		+= ufs/

diff --git a/fs/cifsd/Kconfig → fs/ksmbd/Kconfig b/fs/cifsd/Kconfig → fs/ksmbd/Kconfig
@@ -1,5 +1,5 @@
 config SMB_SERVER
-	tristate "SMB server support (EXPERIMENTAL)"
+	tristate "SMB3 server support (EXPERIMENTAL)"
 	depends on INET
 	depends on MULTIUSER
 	depends on FILE_LOCKING
@@ -31,13 +31,13 @@ config SMB_SERVER
 	  case you can choose N here.
 
 	  You also need to install user space programs which can be found
-	  in cifsd-tools, available from
-	  https://github.com/cifsd-team/cifsd-tools.
-	  More detail about how to run the cifsd kernel server is
+	  in ksmbd-tools, available from
+	  https://github.com/cifsd-team/ksmbd-tools.
+	  More detail about how to run the ksmbd kernel server is
 	  available via README file
-	  (https://github.com/cifsd-team/cifsd-tools/blob/master/README).
+	  (https://github.com/cifsd-team/ksmbd-tools/blob/master/README).
 
-	  cifsd kernel server includes support for auto-negotiation,
+	  ksmbd kernel server includes support for auto-negotiation,
 	  Secure negotiate, Pre-authentication integrity, oplock/lease,
 	  compound requests, multi-credit, packet signing, RDMA(smbdirect),
 	  smb3 encryption, copy-offload, secure per-user session
@@ -61,7 +61,7 @@ config SMB_SERVER_CHECK_CAP_NET_ADMIN
 	default y
 
 	help
-	  Prevent unprivileged processes to start the cifsd kernel server.
+	  Prevent unprivileged processes to start the ksmbd kernel server.
 
 config SMB_SERVER_KERBEROS5
 	bool "Support for Kerberos 5"

diff --git a/fs/cifsd/Makefile → fs/ksmbd/Makefile b/fs/cifsd/Makefile → fs/ksmbd/Makefile
diff --git a/fs/cifsd/asn1.c → fs/ksmbd/asn1.c b/fs/cifsd/asn1.c → fs/ksmbd/asn1.c
diff --git a/fs/cifsd/asn1.h → fs/ksmbd/asn1.h b/fs/cifsd/asn1.h → fs/ksmbd/asn1.h
diff --git a/fs/cifsd/auth.c → fs/ksmbd/auth.c b/fs/cifsd/auth.c → fs/ksmbd/auth.c
diff --git a/fs/cifsd/auth.h → fs/ksmbd/auth.h b/fs/cifsd/auth.h → fs/ksmbd/auth.h
diff --git a/fs/cifsd/connection.c → fs/ksmbd/connection.c b/fs/cifsd/connection.c → fs/ksmbd/connection.c
diff --git a/fs/cifsd/connection.h → fs/ksmbd/connection.h b/fs/cifsd/connection.h → fs/ksmbd/connection.h
diff --git a/fs/cifsd/crypto_ctx.c → fs/ksmbd/crypto_ctx.c b/fs/cifsd/crypto_ctx.c → fs/ksmbd/crypto_ctx.c
diff --git a/fs/cifsd/crypto_ctx.h → fs/ksmbd/crypto_ctx.h b/fs/cifsd/crypto_ctx.h → fs/ksmbd/crypto_ctx.h
diff --git a/fs/cifsd/glob.h → fs/ksmbd/glob.h b/fs/cifsd/glob.h → fs/ksmbd/glob.h
diff --git a/fs/cifsd/ksmbd_server.h → fs/ksmbd/ksmbd_server.h b/fs/cifsd/ksmbd_server.h → fs/ksmbd/ksmbd_server.h
diff --git a/fs/cifsd/ksmbd_spnego_negtokeninit.asn1 → fs/ksmbd/ksmbd_spnego_negtokeninit.asn1 b/fs/cifsd/ksmbd_spnego_negtokeninit.asn1 → fs/ksmbd/ksmbd_spnego_negtokeninit.asn1
diff --git a/fs/cifsd/ksmbd_spnego_negtokentarg.asn1 → fs/ksmbd/ksmbd_spnego_negtokentarg.asn1 b/fs/cifsd/ksmbd_spnego_negtokentarg.asn1 → fs/ksmbd/ksmbd_spnego_negtokentarg.asn1
diff --git a/fs/cifsd/ksmbd_work.c → fs/ksmbd/ksmbd_work.c b/fs/cifsd/ksmbd_work.c → fs/ksmbd/ksmbd_work.c
diff --git a/fs/cifsd/ksmbd_work.h → fs/ksmbd/ksmbd_work.h b/fs/cifsd/ksmbd_work.h → fs/ksmbd/ksmbd_work.h
diff --git a/fs/cifsd/mgmt/ksmbd_ida.c → fs/ksmbd/mgmt/ksmbd_ida.c b/fs/cifsd/mgmt/ksmbd_ida.c → fs/ksmbd/mgmt/ksmbd_ida.c
diff --git a/fs/cifsd/mgmt/ksmbd_ida.h → fs/ksmbd/mgmt/ksmbd_ida.h b/fs/cifsd/mgmt/ksmbd_ida.h → fs/ksmbd/mgmt/ksmbd_ida.h
diff --git a/fs/cifsd/mgmt/share_config.c → fs/ksmbd/mgmt/share_config.c b/fs/cifsd/mgmt/share_config.c → fs/ksmbd/mgmt/share_config.c
diff --git a/fs/cifsd/mgmt/share_config.h → fs/ksmbd/mgmt/share_config.h b/fs/cifsd/mgmt/share_config.h → fs/ksmbd/mgmt/share_config.h
diff --git a/fs/cifsd/mgmt/tree_connect.c → fs/ksmbd/mgmt/tree_connect.c b/fs/cifsd/mgmt/tree_connect.c → fs/ksmbd/mgmt/tree_connect.c
diff --git a/fs/cifsd/mgmt/tree_connect.h → fs/ksmbd/mgmt/tree_connect.h b/fs/cifsd/mgmt/tree_connect.h → fs/ksmbd/mgmt/tree_connect.h
diff --git a/fs/cifsd/mgmt/user_config.c → fs/ksmbd/mgmt/user_config.c b/fs/cifsd/mgmt/user_config.c → fs/ksmbd/mgmt/user_config.c
diff --git a/fs/cifsd/mgmt/user_config.h → fs/ksmbd/mgmt/user_config.h b/fs/cifsd/mgmt/user_config.h → fs/ksmbd/mgmt/user_config.h
diff --git a/fs/cifsd/mgmt/user_session.c → fs/ksmbd/mgmt/user_session.c b/fs/cifsd/mgmt/user_session.c → fs/ksmbd/mgmt/user_session.c
diff --git a/fs/cifsd/mgmt/user_session.h → fs/ksmbd/mgmt/user_session.h b/fs/cifsd/mgmt/user_session.h → fs/ksmbd/mgmt/user_session.h
diff --git a/fs/cifsd/misc.c → fs/ksmbd/misc.c b/fs/cifsd/misc.c → fs/ksmbd/misc.c
diff --git a/fs/cifsd/misc.h → fs/ksmbd/misc.h b/fs/cifsd/misc.h → fs/ksmbd/misc.h
diff --git a/fs/cifsd/ndr.c → fs/ksmbd/ndr.c b/fs/cifsd/ndr.c → fs/ksmbd/ndr.c
diff --git a/fs/cifsd/ndr.h → fs/ksmbd/ndr.h b/fs/cifsd/ndr.h → fs/ksmbd/ndr.h
diff --git a/fs/cifsd/nterr.h → fs/ksmbd/nterr.h b/fs/cifsd/nterr.h → fs/ksmbd/nterr.h
diff --git a/fs/cifsd/ntlmssp.h → fs/ksmbd/ntlmssp.h b/fs/cifsd/ntlmssp.h → fs/ksmbd/ntlmssp.h
diff --git a/fs/cifsd/oplock.c → fs/ksmbd/oplock.c b/fs/cifsd/oplock.c → fs/ksmbd/oplock.c
diff --git a/fs/cifsd/oplock.h → fs/ksmbd/oplock.h b/fs/cifsd/oplock.h → fs/ksmbd/oplock.h
diff --git a/fs/cifsd/server.c → fs/ksmbd/server.c b/fs/cifsd/server.c → fs/ksmbd/server.c
diff --git a/fs/cifsd/server.h → fs/ksmbd/server.h b/fs/cifsd/server.h → fs/ksmbd/server.h
diff --git a/fs/cifsd/smb2misc.c → fs/ksmbd/smb2misc.c b/fs/cifsd/smb2misc.c → fs/ksmbd/smb2misc.c
diff --git a/fs/cifsd/smb2ops.c → fs/ksmbd/smb2ops.c b/fs/cifsd/smb2ops.c → fs/ksmbd/smb2ops.c
diff --git a/fs/cifsd/smb2pdu.c → fs/ksmbd/smb2pdu.c b/fs/cifsd/smb2pdu.c → fs/ksmbd/smb2pdu.c
diff --git a/fs/cifsd/smb2pdu.h → fs/ksmbd/smb2pdu.h b/fs/cifsd/smb2pdu.h → fs/ksmbd/smb2pdu.h
diff --git a/fs/cifsd/smb_common.c → fs/ksmbd/smb_common.c b/fs/cifsd/smb_common.c → fs/ksmbd/smb_common.c
diff --git a/fs/cifsd/smb_common.h → fs/ksmbd/smb_common.h b/fs/cifsd/smb_common.h → fs/ksmbd/smb_common.h
diff --git a/fs/cifsd/smbacl.c → fs/ksmbd/smbacl.c b/fs/cifsd/smbacl.c → fs/ksmbd/smbacl.c
diff --git a/fs/cifsd/smbacl.h → fs/ksmbd/smbacl.h b/fs/cifsd/smbacl.h → fs/ksmbd/smbacl.h
diff --git a/fs/cifsd/smbfsctl.h → fs/ksmbd/smbfsctl.h b/fs/cifsd/smbfsctl.h → fs/ksmbd/smbfsctl.h
diff --git a/fs/cifsd/smbstatus.h → fs/ksmbd/smbstatus.h b/fs/cifsd/smbstatus.h → fs/ksmbd/smbstatus.h
diff --git a/fs/cifsd/transport_ipc.c → fs/ksmbd/transport_ipc.c b/fs/cifsd/transport_ipc.c → fs/ksmbd/transport_ipc.c
diff --git a/fs/cifsd/transport_ipc.h → fs/ksmbd/transport_ipc.h b/fs/cifsd/transport_ipc.h → fs/ksmbd/transport_ipc.h
diff --git a/fs/cifsd/transport_rdma.c → fs/ksmbd/transport_rdma.c b/fs/cifsd/transport_rdma.c → fs/ksmbd/transport_rdma.c
diff --git a/fs/cifsd/transport_rdma.h → fs/ksmbd/transport_rdma.h b/fs/cifsd/transport_rdma.h → fs/ksmbd/transport_rdma.h
diff --git a/fs/cifsd/transport_tcp.c → fs/ksmbd/transport_tcp.c b/fs/cifsd/transport_tcp.c → fs/ksmbd/transport_tcp.c
diff --git a/fs/cifsd/transport_tcp.h → fs/ksmbd/transport_tcp.h b/fs/cifsd/transport_tcp.h → fs/ksmbd/transport_tcp.h
diff --git a/fs/cifsd/unicode.c → fs/ksmbd/unicode.c b/fs/cifsd/unicode.c → fs/ksmbd/unicode.c
diff --git a/fs/cifsd/unicode.h → fs/ksmbd/unicode.h b/fs/cifsd/unicode.h → fs/ksmbd/unicode.h
diff --git a/fs/cifsd/uniupr.h → fs/ksmbd/uniupr.h b/fs/cifsd/uniupr.h → fs/ksmbd/uniupr.h
diff --git a/fs/cifsd/vfs.c → fs/ksmbd/vfs.c b/fs/cifsd/vfs.c → fs/ksmbd/vfs.c
diff --git a/fs/cifsd/vfs.h → fs/ksmbd/vfs.h b/fs/cifsd/vfs.h → fs/ksmbd/vfs.h
diff --git a/fs/cifsd/vfs_cache.c → fs/ksmbd/vfs_cache.c b/fs/cifsd/vfs_cache.c → fs/ksmbd/vfs_cache.c
diff --git a/fs/cifsd/vfs_cache.h → fs/ksmbd/vfs_cache.h b/fs/cifsd/vfs_cache.h → fs/ksmbd/vfs_cache.h