Commit 50bdab9a authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: server: make use of smbdirect.ko 



This means we no longer inline the common smbdirect
.c files and use the exported functions from the
module instead.

Note the connection specific logging is still
redirect to ksmbd.ko functions via
smbdirect_socket_set_logging().

We still don't use real socket layer,
but we're very close...

Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 98bdc5fd

fs/smb/server/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ if SMB_SERVER 


config SMB_SERVER_SMBDIRECT

	bool "Support for SMB Direct protocol"

	depends on SMB_SERVER=m && INFINIBAND && INFINIBAND_ADDR_TRANS || SMB_SERVER=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y

	select SG_POOL

	depends on SMB_SERVER && INFINIBAND && INFINIBAND_ADDR_TRANS

	depends on SMB_SERVER=m || INFINIBAND=y

	select SMB_COMMON_SMBDIRECT

	default n



	help

fs/smb/server/transport_rdma.c

+0 −10
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 


#define SUBMOD_NAME	"smb_direct"



#define SMBDIRECT_USE_INLINE_C_FILES 1



#include <linux/kthread.h>

#include <linux/list.h>

#include <linux/string_choices.h>
@@ -690,11 +688,3 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { 
	.rdma_write	= smb_direct_rdma_write,

	.free_transport = smb_direct_free_transport,

};
 


/*

 * This is a temporary solution until all code

 * is moved to smbdirect_all_c_files.c and we

 * have an smbdirect.ko that exports the required

 * functions.

 */

#include "../common/smbdirect/smbdirect_all_c_files.c"