Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81bf458 authored by Jenny Derzhavetz's avatar Jenny Derzhavetz Committed by Nicholas Bellinger
Browse files

iser-target: Separate flows for np listeners and connections cma events 



No need to restrict this check to specific events.

Signed-off-by: default avatarJenny Derzhavetz <jennyf@mellanox.com>
Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Cc: stable@vger.kernel.org # v3.10+
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent aea92980

drivers/infiniband/ulp/isert/ib_isert.c

+5 −6
Original line number Diff line number Diff line
@@ -889,14 +889,9 @@ isert_disconnected_handler(struct rdma_cm_id *cma_id, 
			   enum rdma_cm_event_type event)

{

	struct isert_np *isert_np = cma_id->context;

	struct isert_conn *isert_conn;

	struct isert_conn *isert_conn = cma_id->qp->qp_context;

	bool terminating = false;



	if (isert_np->cm_id == cma_id)

		return isert_np_cma_handler(cma_id->context, event);



	isert_conn = cma_id->qp->qp_context;



	mutex_lock(&isert_conn->mutex);

	terminating = (isert_conn->state == ISER_CONN_TERMINATING);

	isert_conn_terminate(isert_conn);
@@ -935,12 +930,16 @@ isert_connect_error(struct rdma_cm_id *cma_id) 
static int

isert_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)

{

	struct isert_np *isert_np = cma_id->context;

	int ret = 0;



	isert_info("%s (%d): status %d id %p np %p\n",

		   rdma_event_msg(event->event), event->event,

		   event->status, cma_id, cma_id->context);



	if (isert_np->cm_id == cma_id)

		return isert_np_cma_handler(cma_id->context, event->event);



	switch (event->event) {

	case RDMA_CM_EVENT_CONNECT_REQUEST:

		ret = isert_connect_request(cma_id, event);