Skip to content

Commit 50bdab9

Browse files
metze-sambasmfrench
authored andcommitted
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: Stefan Metzmacher <metze@samba.org> Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 98bdc5f commit 50bdab9

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

fs/smb/server/Kconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ if SMB_SERVER
4747

4848
config SMB_SERVER_SMBDIRECT
4949
bool "Support for SMB Direct protocol"
50-
depends on SMB_SERVER=m && INFINIBAND && INFINIBAND_ADDR_TRANS || SMB_SERVER=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y
51-
select SG_POOL
50+
depends on SMB_SERVER && INFINIBAND && INFINIBAND_ADDR_TRANS
51+
depends on SMB_SERVER=m || INFINIBAND=y
52+
select SMB_COMMON_SMBDIRECT
5253
default n
5354

5455
help

fs/smb/server/transport_rdma.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
#define SUBMOD_NAME "smb_direct"
1111

12-
#define SMBDIRECT_USE_INLINE_C_FILES 1
13-
1412
#include <linux/kthread.h>
1513
#include <linux/list.h>
1614
#include <linux/string_choices.h>
@@ -690,11 +688,3 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = {
690688
.rdma_write = smb_direct_rdma_write,
691689
.free_transport = smb_direct_free_transport,
692690
};
693-
694-
/*
695-
* This is a temporary solution until all code
696-
* is moved to smbdirect_all_c_files.c and we
697-
* have an smbdirect.ko that exports the required
698-
* functions.
699-
*/
700-
#include "../common/smbdirect/smbdirect_all_c_files.c"

0 commit comments

Comments
 (0)