From 3630f4ba6cc6b86d133bd17950d52b3bf084d590 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 6 Dec 2011 19:30:21 +0000
Subject: [PATCH] ib_srpt: Send a reject message with non-zero reason code if
 session creation fails

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3955 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 srpt/src/ib_srpt.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index d61ddf8a8..061af544b 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -2439,8 +2439,10 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
 		srpt_alloc_ioctx_ring(ch->sport->sdev, ch->rq_size,
 				      sizeof(*ch->ioctx_ring[0]),
 				      ch->max_rsp_size, DMA_TO_DEVICE);
-	if (!ch->ioctx_ring)
+	if (!ch->ioctx_ring) {
+		rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
 		goto free_ch;
+	}
 
 	INIT_LIST_HEAD(&ch->free_list);
 	for (i = 0; i < ch->rq_size; i++) {
@@ -2498,6 +2500,7 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
 	ch->thread = kthread_run(srpt_compl_thread, ch, "srpt_%s",
 				 ch->sport->sdev->device->name);
 	if (IS_ERR(ch->thread)) {
+		rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
 		PRINT_ERROR("failed to create kernel thread %ld",
 			    PTR_ERR(ch->thread));
 		ch->thread = NULL;
@@ -2540,9 +2543,10 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id,
 
 	ret = ib_send_cm_rep(cm_id, rep_param);
 	if (ret) {
+		rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
 		PRINT_ERROR("sending SRP_LOGIN_REQ response failed"
 			    " (error code = %d)", ret);
-		goto release_channel;
+		goto reject_and_release;
 	}
 
 	goto out;
@@ -2556,7 +2560,6 @@ reject_and_release:
 	ib_send_cm_rej(cm_id, IB_CM_REJ_CONSUMER_DEFINED, NULL, 0,
 			     (void *)rej, sizeof *rej);
 
-release_channel:
 	srpt_close_ch(ch);
 	/*
 	 * Tell the caller not to free cm_id since srpt_free_ch() will do that.