[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ff082acc-cdcc-2738-6242-d8ef35c42999@users.sourceforge.net>
Date: Mon, 12 Sep 2016 21:01:42 +0200
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: ceph-devel@...r.kernel.org, Alex Elder <elder@...nel.org>,
Ilya Dryomov <idryomov@...il.com>, Sage Weil <sage@...hat.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH 16/47] block-rbd: Rename jump labels in
rbd_dev_v1_header_info()
From: Markus Elfring <elfring@...rs.sourceforge.net>
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 <elfring@...rs.sourceforge.net>
---
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
Powered by blists - more mailing lists