[PATCH 35/47] block-rbd: Rename jump labels in rbd_osd_req_create_copyup()
From: SF Markus Elfring
Date: Mon Sep 12 2016 - 15:24:19 EST
From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 12 Sep 2016 19:53:26 +0200
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/block/rbd.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c349975..f779ff3 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2046,7 +2046,7 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)
osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops,
false, GFP_NOIO);
if (!osd_req)
- goto fail;
+ goto put_request;
osd_req->r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK;
osd_req->r_callback = rbd_osd_req_callback;
@@ -2055,14 +2055,13 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request)
osd_req->r_base_oloc.pool = rbd_dev->layout.pool_id;
if (ceph_oid_aprintf(&osd_req->r_base_oid, GFP_NOIO, "%s",
obj_request->object_name))
- goto fail;
+ goto put_request;
if (ceph_osdc_alloc_messages(osd_req, GFP_NOIO))
- goto fail;
+ goto put_request;
return osd_req;
-
-fail:
+ put_request:
ceph_osdc_put_request(osd_req);
return NULL;
}
--
2.10.0