Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1481924
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 43/47] block-rbd: Rename jump labels in do_rbd_add() |
| Date | 2016-09-12 21:40 +0200 |
| Message-ID | <sgFfd-7H4-67@gated-at.bofh.it> (permalink) |
| References | <qEuGl-43C-5@gated-at.bofh.it> <sgEsN-76N-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 20:03:34 +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 | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index eec41ed..7df0b90 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -6195,12 +6195,12 @@ static ssize_t do_rbd_add(struct bus_type *bus,
/* parse add command */
rc = rbd_add_parse_args(buf, &ceph_opts, &rbd_opts, &spec);
if (rc < 0)
- goto out;
+ goto put_module;
rbdc = rbd_get_client(ceph_opts);
if (IS_ERR(rbdc)) {
rc = PTR_ERR(rbdc);
- goto err_out_args;
+ goto put_spec;
}
/* pick the pool */
@@ -6208,14 +6208,14 @@ static ssize_t do_rbd_add(struct bus_type *bus,
if (rc < 0) {
if (rc == -ENOENT)
pr_info("pool %s does not exist\n", spec->pool_name);
- goto err_out_client;
+ goto put_client;
}
spec->pool_id = (u64)rc;
rbd_dev = rbd_dev_create(rbdc, spec, rbd_opts);
if (!rbd_dev) {
rc = -ENOMEM;
- goto err_out_client;
+ goto put_client;
}
rbdc = NULL; /* rbd_dev now owns this */
spec = NULL; /* rbd_dev now owns this */
@@ -6224,14 +6224,14 @@ static ssize_t do_rbd_add(struct bus_type *bus,
rbd_dev->config_info = kstrdup(buf, GFP_KERNEL);
if (!rbd_dev->config_info) {
rc = -ENOMEM;
- goto err_out_rbd_dev;
+ goto destroy_device;
}
down_write(&rbd_dev->header_rwsem);
rc = rbd_dev_image_probe(rbd_dev, 0);
if (rc < 0) {
up_write(&rbd_dev->header_rwsem);
- goto err_out_rbd_dev;
+ goto destroy_device;
}
/* If we are mapping a snapshot it must be marked read-only */
@@ -6250,22 +6250,21 @@ static ssize_t do_rbd_add(struct bus_type *bus,
*/
rbd_unregister_watch(rbd_dev);
rbd_dev_image_release(rbd_dev);
- goto out;
+ goto put_module;
}
rc = count;
-out:
+ put_module:
module_put(THIS_MODULE);
return rc;
-
-err_out_rbd_dev:
+ destroy_device:
rbd_dev_destroy(rbd_dev);
-err_out_client:
+ put_client:
rbd_put_client(rbdc);
-err_out_args:
+ put_spec:
rbd_spec_put(spec);
kfree(rbd_opts);
- goto out;
+ goto put_module;
}
static ssize_t rbd_add(struct bus_type *bus,
--
2.10.0
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 00/47] RADOS Block Device: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 20:50 +0200
[PATCH 05/47] block-rbd: One function call less in rbd_dev_image_id() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 20:50 +0200
[PATCH 08/47] block-rbd: Rename jump labels in rbd_dev_v2_snap_context() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 09/47] block-rbd: Rename a jump label in rbd_spec_fill_names() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 13/47] block-rbd: Delete an unnecessary initialisation in rbd_dev_v2_parent_info() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 11/47] block-rbd: Delete three unnecessary initialisations in rbd_dev_image_name() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 10/47] block-rbd: One function call less in rbd_dev_image_name() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 14/47] block-rbd: Rename a jump label in rbd_dev_v2_object_prefix() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 12/47] block-rbd: One function call less in rbd_dev_v2_parent_info() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:00 +0200
[PATCH 20/47] block-rbd: Rename a jump label in rbd_register_watch() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 19/47] block-rbd: Rename a jump label in rbd_reregister_watch() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 21/47] block-rbd: Rename jump labels in rbd_try_lock() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 16/47] block-rbd: Rename jump labels in rbd_dev_v1_header_info() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
Re: [PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create() Ilya Dryomov <idryomov@gmail.com> - 2016-09-13 10:10 +0200
[PATCH 17/47] block-rbd: Rename jump labels in rbd_init_disk() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 18/47] block-rbd: Fix jump targets in rbd_queue_workfn() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 22/47] block-rbd: Rename a jump label in find_watcher() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:10 +0200
[PATCH 30/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_callback() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 29/47] block-rbd: Delete an unnecessary initialisation in rbd_img_obj_exists_submit() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 24/47] block-rbd: Rename jump labels in rbd_request_lock() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 23/47] block-rbd: Rename jump labels in get_lock_owner_info() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 26/47] block-rbd: Rename a jump label in rbd_img_parent_read_callback() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 31/47] block-rbd: Fix three jump targets in rbd_img_obj_parent_read_full() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 27/47] block-rbd: Rename a jump label in rbd_img_request_submit() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 25/47] block-rbd: Fix jump targets in rbd_img_parent_read() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
[PATCH 28/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_submit() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:20 +0200
Re: [PATCH 28/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_submit() Ilya Dryomov <idryomov@gmail.com> - 2016-09-13 10:20 +0200
[PATCH 39/47] block-rbd: Rename a jump label in rbd_ioctl_set_ro() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 35/47] block-rbd: Rename jump labels in rbd_osd_req_create_copyup() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 33/47] block-rbd: Adjust the position of a jump label in rbd_img_request_fill() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 38/47] block-rbd: Rename jump labels in rbd_client_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 32/47] block-rbd: Rename a jump label in rbd_img_obj_parent_read_full_callback() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 34/47] block-rbd: Rename a jump label in rbd_img_obj_callback() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 37/47] block-rbd: Rename a jump label in bio_chain_clone_range() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 36/47] block-rbd: Rename jump labels in rbd_osd_req_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:30 +0200
[PATCH 47/47] block-rbd: Delete unwanted spaces behind usages of the sizeof operator SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 44/47] block-rbd: Delete an unnecessary initialisation in do_rbd_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 45/47] block-rbd: Rename a jump label in rbd_slab_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 42/47] block-rbd: Rename jump labels in rbd_dev_image_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 40/47] block-rbd: One function call less in rbd_dev_probe_parent() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 46/47] block-rbd: Rename jump labels in rbd_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 41/47] block-rbd: Rename jump labels in rbd_dev_device_setup() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
[PATCH 43/47] block-rbd: Rename jump labels in do_rbd_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-12 21:40 +0200
csiph-web