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

smb: client: make use of SMBDIRECT_RECV_IO_MAX_SGE 



Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.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 3515aa6e

fs/smb/client/smbdirect.c

+2 −2
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ static struct smbd_connection *_smbd_get_connection( 
	sp->keepalive_interval_msec = smbd_keep_alive_interval * 1000;



	if (sc->ib.dev->attrs.max_send_sge < SMBDIRECT_MAX_SEND_SGE ||

	    sc->ib.dev->attrs.max_recv_sge < SMBDIRECT_MAX_RECV_SGE) {

	    sc->ib.dev->attrs.max_recv_sge < SMBDIRECT_RECV_IO_MAX_SGE) {

		log_rdma_event(ERR,

			"device %.*s max_send_sge/max_recv_sge = %d/%d too small\n",

			IB_DEVICE_NAME_MAX,
@@ -1595,7 +1595,7 @@ static struct smbd_connection *_smbd_get_connection( 
	qp_attr.cap.max_send_wr = sp->send_credit_target;

	qp_attr.cap.max_recv_wr = sp->recv_credit_max;

	qp_attr.cap.max_send_sge = SMBDIRECT_MAX_SEND_SGE;

	qp_attr.cap.max_recv_sge = SMBDIRECT_MAX_RECV_SGE;

	qp_attr.cap.max_recv_sge = SMBDIRECT_RECV_IO_MAX_SGE;

	qp_attr.cap.max_inline_data = 0;

	qp_attr.sq_sig_type = IB_SIGNAL_REQ_WR;

	qp_attr.qp_type = IB_QPT_RC;

fs/smb/client/smbdirect.h

+0 −3
Original line number Diff line number Diff line
@@ -139,9 +139,6 @@ struct smbd_request { 
	u8 packet[];

};



/* Maximum number of SGEs used by smbdirect.c in any receive work request */

#define SMBDIRECT_MAX_RECV_SGE	1



/* Create a SMBDirect session */

struct smbd_connection *smbd_get_connection(

	struct TCP_Server_Info *server, struct sockaddr *dstaddr);