Reverted r857 because the coding style of r856 is believed to be what is expected...
authorbvassche <bvassche@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 19 May 2009 16:41:09 +0000 (16:41 +0000)
committerbvassche <bvassche@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 19 May 2009 16:41:09 +0000 (16:41 +0000)
git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@860 d57e44dd-8a1f-0410-8b47-8ef2f437770f

srpt/src/ib_srpt.c

index 1912d97..cbd82a0 100644 (file)
@@ -872,7 +872,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, struct srpt_ioctx *ioctx)
                                           NO_ADD_SENSE, srp_cmd->tag);
                        ((struct srp_rsp *)ioctx->buf)->status =
                                        SAM_STAT_TASK_SET_FULL;
-                       return -1;
+                       goto send_rsp;
                }
 
                if (indirect_desc) {
@@ -880,7 +880,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, struct srpt_ioctx *ioctx)
                                           NO_ADD_SENSE, srp_cmd->tag);
                        ((struct srp_rsp *)ioctx->buf)->status =
                                        SAM_STAT_TASK_SET_FULL;
-                       return -1;
+                       goto send_rsp;
                }
 
                if (srp_cmd->buf_fmt & 0xf)
@@ -900,7 +900,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, struct srpt_ioctx *ioctx)
                                   NO_ADD_SENSE, srp_cmd->tag);
                ((struct srp_rsp *)ioctx->buf)->status =
                        SAM_STAT_TASK_SET_FULL;
-               return -1;
+               goto send_rsp;
        }
 
        ioctx->scmnd = scmnd;
@@ -935,6 +935,9 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, struct srpt_ioctx *ioctx)
        scst_cmd_init_done(scmnd, scst_estimate_context());
 
        return 0;
+
+send_rsp:
+       return -1;
 }
 
 /*
@@ -961,7 +964,7 @@ static int srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch,
        if (!mgmt_ioctx) {
                srpt_build_tskmgmt_rsp(ch, ioctx, SRP_TSK_MGMT_FAILED,
                                       srp_tsk->tag);
-               return -1;
+               goto send_rsp;
        }
 
        mgmt_ioctx->ioctx = ioctx;
@@ -1019,9 +1022,12 @@ static int srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch,
                srpt_build_tskmgmt_rsp(ch, ioctx,
                                       SRP_TSK_MGMT_FUNC_NOT_SUPP,
                                       srp_tsk->tag);
-               return -1;
+               goto send_rsp;
        }
        return 0;
+
+send_rsp:
+       return -1;
 }
 
 static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,