[PATCH 36/47] block-rbd: Rename jump labels in rbd_osd_req_create()

SF Markus Elfring
2016-09-12T19:25:19Z

Date: Mon, 12 Sep 2016 19:54:39 +0200

Adjust jump labels according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
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 f779ff3..8e9d30f7 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1988,7 +1988,7 @@ static struct ceph_osd_request *rbd_osd_req_create(
osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false,
GFP_NOIO);
if (!osd_req)
- goto fail;
+ goto put_request;

if (op_type == OBJ_OP_WRITE || op_type == OBJ_OP_DISCARD)
osd_req->r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK;
@@ -2001,14 +2001,13 @@ static struct ceph_osd_request *rbd_osd_req_create(
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