Unverified Commit ae9d84d6 authored by Steve French's avatar Steve French Committed by GitHub
Browse files

Merge pull request #56 from namjaejeon/cifsd-for-next 

ksmbd-fixes
parents be8bcf8b af34983e

Documentation/filesystems/cifs/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ CIFS 
.. toctree::

   :maxdepth: 1



   cifsd

   ksmbd

   cifsroot

Documentation/filesystems/cifs/cifsd.rst→Documentation/filesystems/cifs/ksmbd.rst

+5 −5
Original line number Diff line number Diff line 
.. 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

MAINTAINERS

+9 −10
Original line number Diff line number Diff line
@@ -4540,16 +4540,6 @@ T: git git://git.samba.org/sfrench/cifs-2.6.git 
F:	Documentation/admin-guide/cifs/

F:	fs/cifs/









COMMON INTERNET FILE SYSTEM SERVER (CIFSD)









M:	Namjae Jeon <namjae.jeon@samsung.com>









M:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>









M:	Steve French <sfrench@samba.org>









M:	Hyunchul Lee <hyc.lee@gmail.com>









L:	linux-cifs@vger.kernel.org









L:	linux-cifsd-devel@lists.sourceforge.net









S:	Maintained









F:	fs/cifsd/

















COMPACTPCI HOTPLUG CORE









M:	Scott Murray <scott@spiteful.org>









L:	linux-pci@vger.kernel.org










@@ -9948,6 +9938,15 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git







F:	Documentation/dev-tools/kselftest*









F:	tools/testing/selftests/

















KERNEL SMB3 SERVER (KSMBD)









M:	Namjae Jeon <namjae.jeon@samsung.com>









M:	Sergey Senozhatsky <senozhatsky@chromium.org>









M:	Steve French <sfrench@samba.org>









M:	Hyunchul Lee <hyc.lee@gmail.com>









L:	linux-cifs@vger.kernel.org









S:	Maintained









F:	fs/ksmbd/

















KERNEL UNIT TESTING FRAMEWORK (KUnit)









M:	Brendan Higgins <brendanhiggins@google.com>









L:	linux-kselftest@vger.kernel.org


































fs/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -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"


































fs/Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -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/