From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Mon, 12 Sep 2016 19:01:42 +0000 Subject: [PATCH 16/47] block-rbd: Rename jump labels in rbd_dev_v1_header_info() Message-Id: List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> In-Reply-To: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Mon, 12 Sep 2016 18:15:44 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 262805a..0b6f0f9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4352,17 +4352,17 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev) ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_oid.name, 0, size, ondisk); if (ret < 0) - goto out; + goto free_header; if ((size_t)ret < size) { ret = -ENXIO; rbd_warn(rbd_dev, "short header read (want %zd got %d)", size, ret); - goto out; + goto free_header; } if (!rbd_dev_ondisk_valid(ondisk)) { ret = -ENXIO; rbd_warn(rbd_dev, "invalid header"); - goto out; + goto free_header; } names_size = le64_to_cpu(ondisk->snap_names_len); @@ -4371,7 +4371,7 @@ static int rbd_dev_v1_header_info(struct rbd_device *rbd_dev) } while (snap_count != want_count); ret = rbd_header_from_disk(rbd_dev, ondisk); -out: + free_header: kfree(ondisk); return ret; -- 2.10.0