Skip to contentSkip to conversation

FAILED: patch "[PATCH] iser-target: Separate flows for np listeners and connections" failed to apply to 3.14-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2016

Subsystems (3)
Stable branch InfiniBand iSCSI extensions for RDMA (iSER) target
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From f81bf458208ef6d12b2fc08091204e3859dcdba4 Mon Sep 17 00:00:00 2001

From: Jenny Derzhavetz <[email protected]>
Date: Wed, 24 Feb 2016 19:24:00 +0200
Subject: [PATCH] iser-target: Separate flows for np listeners and connections
cma events

No need to restrict this check to specific events.

Signed-off-by Jenny Derzhavetz <[email protected]>
Signed-off-by Sagi Grimberg <[email protected]>
Cc [email protected] # v3.10+
Signed-off-by Nicholas Bellinger <[email protected]>
drivers/infiniband/ulp/isert/ib_isert.c +5 -6
index 320d3a55249c..73b2233edcff 100644
@@ -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);