[Xen-devel] [PATCH v2 2/3] xen-scsiback: Rename jump labels in scsiback_device_action()

[SF Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>]

From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 20 Jul 2016 13:03:16 +0200

* Adjust jump targets according to the Linux coding style convention.

* A bit of refactoring for the control flow

Suggested-by: Jürgen Groß <jgross@xxxxxxxx>
Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
v2: Rebased on source files from "Linux next-20160719"
    Changes from a bit of code review

 drivers/xen/xen-scsiback.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 4a48c06..eb274df 100644
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -604,10 +604,8 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
        int rc, err = FAILED;
 
        tmr = kzalloc(sizeof(struct scsiback_tmr), GFP_KERNEL);
-       if (!tmr) {
-               target_put_sess_cmd(se_cmd);
-               goto err;
-       }
+       if (!tmr)
+               goto put_cmd;
 
        init_waitqueue_head(&tmr->tmr_wait);
 
@@ -616,7 +614,7 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
                               unpacked_lun, tmr, act, GFP_KERNEL,
                               tag, TARGET_SCF_ACK_KREF);
        if (rc)
-               goto err;
+               goto free_tmr;
 
        wait_event(tmr->tmr_wait, atomic_read(&tmr->tmr_complete));
 
@@ -626,7 +624,9 @@ static void scsiback_device_action(struct vscsibk_pend 
*pending_req,
        scsiback_do_resp_with_sense(NULL, err, 0, pending_req);
        transport_generic_free_cmd(&pending_req->se_cmd, 1);
        return;
-err:
+put_cmd:
+       target_put_sess_cmd(se_cmd);
+free_tmr:
        kfree(tmr);
        scsiback_do_resp_with_sense(NULL, err, 0, pending_req);
 }
-- 
2.9.2


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel