From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Date: Mon, 12 Sep 2016 19:39:54 +0200 * Adjust jump targets according to the current Linux coding style convention. * Delete a duplicate check then at the end. Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> --- drivers/block/rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 09a0ed3..6777464 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3120,7 +3120,7 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) obj_request->length); result = -ENOMEM; if (!img_request) - goto out_err; + goto status_indication; if (obj_request->type == OBJ_REQUEST_BIO) result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO, @@ -3129,17 +3129,17 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) result = rbd_img_request_fill(img_request, OBJ_REQUEST_PAGES, obj_request->pages); if (result) - goto out_err; + goto put_request; img_request->callback = rbd_img_parent_read_callback; result = rbd_img_request_submit(img_request); if (result) - goto out_err; + goto put_request; return; -out_err: - if (img_request) - rbd_img_request_put(img_request); + put_request: + rbd_img_request_put(img_request); + status_indication: obj_request->result = result; obj_request->xferred = 0; obj_request_done_set(obj_request); -- 2.10.0 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
