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

smb: client: make use of common smbdirect_socket 



This is the next step in the direction of a common smbdirect layer.
Currently only structures are shared, but that will change
over time until everything is shared.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Hyunchul Lee <hyc.lee@gmail.com>
Cc: Meetakshi Setiya <meetakshisetiyaoss@gmail.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 22234e37

fs/smb/client/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
		seq_printf(m, "\nSMBDirect (in hex) protocol version: %x "

			"transport status: %x",

			server->smbd_conn->protocol,

			server->smbd_conn->transport_status);

			server->smbd_conn->socket.status);

		seq_printf(m, "\nConn receive_credit_max: %x "

			"send_credit_target: %x max_send_size: %x",

			server->smbd_conn->receive_credit_max,

fs/smb/client/smbdirect.c

+141 −117

File changed.

Preview size limit exceeded, changes collapsed.

fs/smb/client/smbdirect.h

+4 −8
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <rdma/rdma_cm.h>

#include <linux/mempool.h>



#include "../common/smbdirect/smbdirect_socket.h"



extern int rdma_readwrite_threshold;

extern int smbd_max_frmr_depth;

extern int smbd_keep_alive_interval;
@@ -50,14 +52,8 @@ enum smbd_connection_status { 
 * 5. mempools for allocating packets

 */

struct smbd_connection {

	enum smbd_connection_status transport_status;



	/* RDMA related */

	struct rdma_cm_id *id;

	struct ib_qp_init_attr qp_attr;

	struct ib_pd *pd;

	struct ib_cq *send_cq, *recv_cq;

	struct ib_device_attr dev_attr;

	struct smbdirect_socket socket;



	int ri_rc;

	struct completion ri_done;

	wait_queue_head_t conn_wait;