Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1481832 > unrolled thread

[PATCH 00/47] RADOS Block Device: Fine-tuning for several function implementations

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [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

Page 1 of 3  [1] 2 3  Next page →

#1481832 — [PATCH 00/47] RADOS Block Device: Fine-tuning for several function implementations

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 20:35:20 +0200

Several update suggestions were taken into account
from static source code analysis.

Markus Elfring (47):
  Use kmalloc_array() in rbd_header_from_disk()
  Less function calls in rbd_header_from_disk() after error detection
  Adjust the position of a jump label in rbd_header_from_disk()
  Refactor two calls for memory allocations in rbd_dev_image_id()
  One function call less in rbd_dev_image_id() after error detection
  Rename jump labels in rbd_add_parse_args()
  Rename a jump label in rbd_dev_v2_snap_name()
  Rename jump labels in rbd_dev_v2_snap_context()
  Rename a jump label in rbd_spec_fill_names()
  One function call less in rbd_dev_image_name() after error detection
  Delete three unnecessary initialisations in rbd_dev_image_name()
  One function call less in rbd_dev_v2_parent_info() after error detection
  Delete an unnecessary initialisation in rbd_dev_v2_parent_info()
  Rename a jump label in rbd_dev_v2_object_prefix()
  Rename jump labels in rbd_dev_create()
  Rename jump labels in rbd_dev_v1_header_info()
  Rename jump labels in rbd_init_disk()
  Fix jump targets in rbd_queue_workfn()
  Rename a jump label in rbd_reregister_watch()
  Rename a jump label in rbd_register_watch()
  Rename jump labels in rbd_try_lock()
  Rename a jump label in find_watcher()
  Rename jump labels in get_lock_owner_info()
  Rename jump labels in rbd_request_lock()
  Fix jump targets in rbd_img_parent_read()
  Rename a jump label in rbd_img_parent_read_callback()
  Rename a jump label in rbd_img_request_submit()
  Refactor a jump target in rbd_img_obj_exists_submit()
  Delete an unnecessary initialisation in rbd_img_obj_exists_submit()
  Refactor a jump target in rbd_img_obj_exists_callback()
  Fix three jump targets in rbd_img_obj_parent_read_full()
  Rename a jump label in rbd_img_obj_parent_read_full_callback()
  Adjust the position of a jump label in rbd_img_request_fill()
  Rename a jump label in rbd_img_obj_callback()
  Rename jump labels in rbd_osd_req_create_copyup()
  Rename jump labels in rbd_osd_req_create()
  Rename a jump label in bio_chain_clone_range()
  Rename jump labels in rbd_client_create()
  Rename a jump label in rbd_ioctl_set_ro()
  One function call less in rbd_dev_probe_parent() after error detection
  Rename jump labels in rbd_dev_device_setup()
  Rename jump labels in rbd_dev_image_probe()
  Rename jump labels in do_rbd_add()
  Delete an unnecessary initialisation in do_rbd_add()
  Rename a jump label in rbd_slab_init()
  Rename jump labels in rbd_init()
  Delete unwanted spaces behind usages of the sizeof operator

 drivers/block/rbd.c | 544 ++++++++++++++++++++++++++--------------------------
 1 file changed, 272 insertions(+), 272 deletions(-)

-- 
2.10.0

[toc] | [next] | [standalone]

#1481834 — [PATCH 05/47] block-rbd: One function call less in rbd_dev_image_id() after error detection

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 11 Sep 2016 15:05:49 +0200

The kfree() function was called in one case by the rbd_dev_image_id()
function during error handling even if the passed variable "response"
contained a null pointer.

Adjust a jump target according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c1da844..a6d9a06 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5865,7 +5865,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 	response = kzalloc(sizeof(__le32) + RBD_IMAGE_ID_LEN_MAX, GFP_NOIO);
 	if (!response) {
 		ret = -ENOMEM;
-		goto out;
+		goto free_name;
 	}
 
 	/* If it doesn't exist we'll assume it's a format 1 image */
@@ -5893,8 +5893,8 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev)
 		rbd_dev->spec->image_id = image_id;
 		dout("image_id is %s\n", image_id);
 	}
-out:
 	kfree(response);
+ free_name:
 	kfree(object_name);
 
 	return ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481837 — [PATCH 08/47] block-rbd: Rename jump labels in rbd_dev_v2_snap_context()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 17:55:51 +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 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 4164551..45109ff 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5465,13 +5465,13 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)
 				reply_buf, size);
 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
 	if (ret < 0)
-		goto out;
+		goto free_buffer;
 
 	p = reply_buf;
 	end = reply_buf + ret;
 	ret = -ERANGE;
-	ceph_decode_64_safe(&p, end, seq, out);
-	ceph_decode_32_safe(&p, end, snap_count, out);
+	ceph_decode_64_safe(&p, end, seq, free_buffer);
+	ceph_decode_32_safe(&p, end, snap_count, free_buffer);
 
 	/*
 	 * Make sure the reported number of snapshot ids wouldn't go
@@ -5482,16 +5482,16 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)
 	if (snap_count > (SIZE_MAX - sizeof (struct ceph_snap_context))
 				 / sizeof (u64)) {
 		ret = -EINVAL;
-		goto out;
+		goto free_buffer;
 	}
 	if (!ceph_has_room(&p, end, snap_count * sizeof (__le64)))
-		goto out;
+		goto free_buffer;
 	ret = 0;
 
 	snapc = ceph_create_snap_context(snap_count, GFP_KERNEL);
 	if (!snapc) {
 		ret = -ENOMEM;
-		goto out;
+		goto free_buffer;
 	}
 	snapc->seq = seq;
 	for (i = 0; i < snap_count; i++)
@@ -5502,7 +5502,7 @@ static int rbd_dev_v2_snap_context(struct rbd_device *rbd_dev)
 
 	dout("  snap context seq = %llu, snap_count = %u\n",
 		(unsigned long long)seq, (unsigned int)snap_count);
-out:
+ free_buffer:
 	kfree(reply_buf);
 
 	return ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481838 — [PATCH 09/47] block-rbd: Rename a jump label in rbd_spec_fill_names()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 17:58:18 +0200

Adjust a jump label according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 45109ff..aac51a1 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5421,7 +5421,7 @@ static int rbd_spec_fill_names(struct rbd_device *rbd_dev)
 	snap_name = rbd_snap_name(rbd_dev, spec->snap_id);
 	if (IS_ERR(snap_name)) {
 		ret = PTR_ERR(snap_name);
-		goto out_err;
+		goto free_name;
 	}
 
 	spec->pool_name = pool_name;
@@ -5429,8 +5429,7 @@ static int rbd_spec_fill_names(struct rbd_device *rbd_dev)
 	spec->snap_name = snap_name;
 
 	return 0;
-
-out_err:
+ free_name:
 	kfree(image_name);
 	kfree(pool_name);
 	return ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481843 — [PATCH 13/47] block-rbd: Delete an unnecessary initialisation in rbd_dev_v2_parent_info()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:08:14 +0200

The local variable "reply_buf" will be set to an appropriate pointer
a bit later. Thus omit the explicit initialisation at the beginning.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 946e3ca..aff8c4e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5084,7 +5084,7 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 {
 	struct rbd_spec *parent_spec;
 	size_t size;
-	void *reply_buf = NULL;
+	void *reply_buf;
 	__le64 snapid;
 	void *p;
 	void *end;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481844 — [PATCH 11/47] block-rbd: Delete three unnecessary initialisations in rbd_dev_image_name()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:02:16 +0200

Three local variables will be set to appropriate values a bit later.
Thus omit the explicit initialisation at the beginning.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 145bbcc..90797aa 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5256,9 +5256,9 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
 	void *p;
 	void *end;
 	size_t size;
-	void *reply_buf = NULL;
-	size_t len = 0;
-	char *image_name = NULL;
+	void *reply_buf;
+	size_t len;
+	char *image_name;
 	int ret;
 
 	rbd_assert(!rbd_dev->spec->image_name);
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481848 — [PATCH 10/47] block-rbd: One function call less in rbd_dev_image_name() after error detection

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:00:18 +0200

The kfree() function was called in one case by the rbd_dev_image_name()
function during error handling even if the passed variable "reply_buf"
contained a null pointer.

Adjust jump targets according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index aac51a1..145bbcc 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5276,14 +5276,14 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
 	size = sizeof (__le32) + RBD_IMAGE_NAME_LEN_MAX;
 	reply_buf = kmalloc(size, GFP_KERNEL);
 	if (!reply_buf)
-		goto out;
+		goto free_id;
 
 	ret = rbd_obj_method_sync(rbd_dev, RBD_DIRECTORY,
 				"rbd", "dir_get_name",
 				image_id, image_id_size,
 				reply_buf, size);
 	if (ret < 0)
-		goto out;
+		goto free_buffer;
 	p = reply_buf;
 	end = reply_buf + ret;
 
@@ -5292,8 +5292,9 @@ static char *rbd_dev_image_name(struct rbd_device *rbd_dev)
 		image_name = NULL;
 	else
 		dout("%s: name is %s len is %zd\n", __func__, image_name, len);
-out:
+ free_buffer:
 	kfree(reply_buf);
+ free_id:
 	kfree(image_id);
 
 	return image_name;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481849 — [PATCH 14/47] block-rbd: Rename a jump label in rbd_dev_v2_object_prefix()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:10:02 +0200

Adjust a jump label according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index aff8c4e..6acddc53 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5017,7 +5017,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)
 				reply_buf, RBD_OBJ_PREFIX_LEN_MAX);
 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
 	if (ret < 0)
-		goto out;
+		goto free_buffer;
 
 	p = reply_buf;
 	rbd_dev->header.object_prefix = ceph_extract_encoded_string(&p,
@@ -5030,7 +5030,7 @@ static int rbd_dev_v2_object_prefix(struct rbd_device *rbd_dev)
 	} else {
 		dout("  object_prefix = %s\n", rbd_dev->header.object_prefix);
 	}
-out:
+ free_buffer:
 	kfree(reply_buf);
 
 	return ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481850 — [PATCH 12/47] block-rbd: One function call less in rbd_dev_v2_parent_info() after error detection

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:05:00 +0200

The kfree() function was called in one case by the rbd_dev_v2_parent_info()
function during error handling even if the passed variable "reply_buf"
contained a null pointer.

Adjust jump targets according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 90797aa..946e3ca 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -5105,7 +5105,7 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 	reply_buf = kmalloc(size, GFP_KERNEL);
 	if (!reply_buf) {
 		ret = -ENOMEM;
-		goto out_err;
+		goto put_spec;
 	}
 
 	snapid = cpu_to_le64(rbd_dev->spec->snap_id);
@@ -5115,12 +5115,12 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 				reply_buf, size);
 	dout("%s: rbd_obj_method_sync returned %d\n", __func__, ret);
 	if (ret < 0)
-		goto out_err;
+		goto free_buffer;
 
 	p = reply_buf;
 	end = reply_buf + ret;
 	ret = -ERANGE;
-	ceph_decode_64_safe(&p, end, pool_id, out_err);
+	ceph_decode_64_safe(&p, end, pool_id, free_buffer);
 	if (pool_id == CEPH_NOPOOL) {
 		/*
 		 * Either the parent never existed, or we have
@@ -5138,7 +5138,7 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 				rbd_dev->disk->disk_name);
 		}
 
-		goto out;	/* No parent?  No problem. */
+		goto success_indication;	/* No parent?  No problem. */
 	}
 
 	/* The ceph file layout needs to fit pool id in 32 bits */
@@ -5147,16 +5147,16 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 	if (pool_id > (u64)U32_MAX) {
 		rbd_warn(NULL, "parent pool id too large (%llu > %u)",
 			(unsigned long long)pool_id, U32_MAX);
-		goto out_err;
+		goto free_buffer;
 	}
 
 	image_id = ceph_extract_encoded_string(&p, end, NULL, GFP_KERNEL);
 	if (IS_ERR(image_id)) {
 		ret = PTR_ERR(image_id);
-		goto out_err;
+		goto free_buffer;
 	}
-	ceph_decode_64_safe(&p, end, snap_id, out_err);
-	ceph_decode_64_safe(&p, end, overlap, out_err);
+	ceph_decode_64_safe(&p, end, snap_id, free_buffer);
+	ceph_decode_64_safe(&p, end, overlap, free_buffer);
 
 	/*
 	 * The parent won't change (except when the clone is
@@ -5189,11 +5189,11 @@ static int rbd_dev_v2_parent_info(struct rbd_device *rbd_dev)
 		}
 	}
 	rbd_dev->parent_overlap = overlap;
-
-out:
+ success_indication:
 	ret = 0;
-out_err:
+ free_buffer:
 	kfree(reply_buf);
+ put_spec:
 	rbd_spec_put(parent_spec);
 
 	return ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481852 — [PATCH 20/47] block-rbd: Rename a jump label in rbd_register_watch()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:33:00 +0200

Adjust a jump label according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 97dbc1a..b0b5a3b 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3900,12 +3900,11 @@ static int rbd_register_watch(struct rbd_device *rbd_dev)
 	rbd_assert(rbd_dev->watch_state == RBD_WATCH_STATE_UNREGISTERED);
 	ret = __rbd_register_watch(rbd_dev);
 	if (ret)
-		goto out;
+		goto unlock;
 
 	rbd_dev->watch_state = RBD_WATCH_STATE_REGISTERED;
 	rbd_dev->watch_cookie = rbd_dev->watch_handle->linger_id;
-
-out:
+ unlock:
 	mutex_unlock(&rbd_dev->watch_mutex);
 	return ret;
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481857 — [PATCH 19/47] block-rbd: Rename a jump label in rbd_reregister_watch()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:31:04 +0200

Adjust a jump label according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 2b5f76e..97dbc1a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3950,7 +3950,7 @@ static void rbd_reregister_watch(struct work_struct *work)
 
 	mutex_lock(&rbd_dev->watch_mutex);
 	if (rbd_dev->watch_state != RBD_WATCH_STATE_ERROR)
-		goto fail_unlock;
+		goto unlock;
 
 	ret = __rbd_register_watch(rbd_dev);
 	if (ret) {
@@ -3959,7 +3959,7 @@ static void rbd_reregister_watch(struct work_struct *work)
 			queue_delayed_work(rbd_dev->task_wq,
 					   &rbd_dev->watch_dwork,
 					   RBD_RETRY_DELAY);
-		goto fail_unlock;
+		goto unlock;
 	}
 
 	rbd_dev->watch_state = RBD_WATCH_STATE_REGISTERED;
@@ -3980,8 +3980,7 @@ static void rbd_reregister_watch(struct work_struct *work)
 	up_write(&rbd_dev->lock_rwsem);
 	wake_requests(rbd_dev, true);
 	return;
-
-fail_unlock:
+ unlock:
 	mutex_unlock(&rbd_dev->watch_mutex);
 	up_write(&rbd_dev->lock_rwsem);
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481860 — [PATCH 21/47] block-rbd: Rename jump labels in rbd_try_lock()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:35:08 +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 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b0b5a3b..7802351 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3478,7 +3478,7 @@ static int rbd_try_lock(struct rbd_device *rbd_dev)
 		if (ret) {
 			if (ret > 0)
 				ret = 0; /* have to request lock */
-			goto out;
+			goto free_lockers;
 		}
 
 		rbd_warn(rbd_dev, "%s%llu seems dead, breaking lock",
@@ -3489,7 +3489,7 @@ static int rbd_try_lock(struct rbd_device *rbd_dev)
 		if (ret) {
 			rbd_warn(rbd_dev, "blacklist of %s%llu failed: %d",
 				 ENTITY_NAME(lockers[0].id.name), ret);
-			goto out;
+			goto free_lockers;
 		}
 
 		ret = ceph_cls_break_lock(&client->osdc, &rbd_dev->header_oid,
@@ -3497,13 +3497,11 @@ static int rbd_try_lock(struct rbd_device *rbd_dev)
 					  lockers[0].id.cookie,
 					  &lockers[0].id.name);
 		if (ret && ret != -ENOENT)
-			goto out;
-
-again:
+			goto free_lockers;
+ again:
 		ceph_free_lockers(lockers, num_lockers);
 	}
-
-out:
+ free_lockers:
 	ceph_free_lockers(lockers, num_lockers);
 	return ret;
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481861 — [PATCH 16/47] block-rbd: Rename jump labels in rbd_dev_v1_header_info()

From: Markus Elfring <elfring@users.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@users.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

[toc] | [prev] | [next] | [standalone]

#1481863 — [PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:12: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 6acddc53..262805a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4930,23 +4930,22 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
 					 minor_to_rbd_dev_id(1 << MINORBITS),
 					 GFP_KERNEL);
 	if (rbd_dev->dev_id < 0)
-		goto fail_rbd_dev;
+		goto free_device;
 
 	sprintf(rbd_dev->name, RBD_DRV_NAME "%d", rbd_dev->dev_id);
 	rbd_dev->task_wq = alloc_ordered_workqueue("%s-tasks", WQ_MEM_RECLAIM,
 						   rbd_dev->name);
 	if (!rbd_dev->task_wq)
-		goto fail_dev_id;
+		goto remove_id;
 
 	/* we have a ref from do_rbd_add() */
 	__module_get(THIS_MODULE);
 
 	dout("%s rbd_dev %p dev_id %d\n", __func__, rbd_dev, rbd_dev->dev_id);
 	return rbd_dev;
-
-fail_dev_id:
+ remove_id:
 	ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
-fail_rbd_dev:
+ free_device:
 	rbd_dev_free(rbd_dev);
 	return NULL;
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1482230 — Re: [PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create()

On Mon, Sep 12, 2016 at 9:00 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 12 Sep 2016 18:12: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 6acddc53..262805a 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -4930,23 +4930,22 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
>                                          minor_to_rbd_dev_id(1 << MINORBITS),
>                                          GFP_KERNEL);
>         if (rbd_dev->dev_id < 0)
> -               goto fail_rbd_dev;
> +               goto free_device;
>
>         sprintf(rbd_dev->name, RBD_DRV_NAME "%d", rbd_dev->dev_id);
>         rbd_dev->task_wq = alloc_ordered_workqueue("%s-tasks", WQ_MEM_RECLAIM,
>                                                    rbd_dev->name);
>         if (!rbd_dev->task_wq)
> -               goto fail_dev_id;
> +               goto remove_id;
>
>         /* we have a ref from do_rbd_add() */
>         __module_get(THIS_MODULE);
>
>         dout("%s rbd_dev %p dev_id %d\n", __func__, rbd_dev, rbd_dev->dev_id);
>         return rbd_dev;
> -
> -fail_dev_id:
> + remove_id:
>         ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
> -fail_rbd_dev:
> + free_device:
>         rbd_dev_free(rbd_dev);
>         return NULL;
>  }
> --
> 2.10.0
>

Really?  I mean out_err -> free_device I can understand, but this?

Thanks,

                Ilya

[toc] | [prev] | [next] | [standalone]

#1481865 — [PATCH 17/47] block-rbd: Rename jump labels in rbd_init_disk()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:26:28 +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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 0b6f0f9..97d4d63 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4500,12 +4500,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 
 	err = blk_mq_alloc_tag_set(&rbd_dev->tag_set);
 	if (err)
-		goto out_disk;
+		goto put_disk;
 
 	q = blk_mq_init_queue(&rbd_dev->tag_set);
 	if (IS_ERR(q)) {
 		err = PTR_ERR(q);
-		goto out_tag_set;
+		goto free_tag_set;
 	}
 
 	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
@@ -4537,9 +4537,9 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 	rbd_dev->disk = disk;
 
 	return 0;
-out_tag_set:
+ free_tag_set:
 	blk_mq_free_tag_set(&rbd_dev->tag_set);
-out_disk:
+ put_disk:
 	put_disk(disk);
 	return err;
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481868 — [PATCH 18/47] block-rbd: Fix jump targets in rbd_queue_workfn()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 18:28:23 +0200

* Adjust jump targets according to the current Linux coding
  style convention.

* Delete a duplicate check then at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 97d4d63..2b5f76e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4113,7 +4113,7 @@ static void rbd_queue_workfn(struct work_struct *work)
 		dout("%s: non-fs request type %d\n", __func__,
 			(int) rq->cmd_type);
 		result = -EIO;
-		goto err;
+		goto end_request;
 	}
 
 	if (req_op(rq) == REQ_OP_DISCARD)
@@ -4128,7 +4128,7 @@ static void rbd_queue_workfn(struct work_struct *work)
 	if (!length) {
 		dout("%s: zero-length request\n", __func__);
 		result = 0;
-		goto err_rq;
+		goto put_snap_context;
 	}
 
 	/* Only reads are allowed to a read-only device */
@@ -4136,7 +4136,7 @@ static void rbd_queue_workfn(struct work_struct *work)
 	if (op_type != OBJ_OP_READ) {
 		if (rbd_dev->mapping.read_only) {
 			result = -EROFS;
-			goto err_rq;
+			goto warn_more;
 		}
 		rbd_assert(rbd_dev->spec->snap_id == CEPH_NOSNAP);
 	}
@@ -4151,14 +4151,14 @@ static void rbd_queue_workfn(struct work_struct *work)
 		dout("request for non-existent snapshot");
 		rbd_assert(rbd_dev->spec->snap_id != CEPH_NOSNAP);
 		result = -ENXIO;
-		goto err_rq;
+		goto warn_more;
 	}
 
 	if (offset && length > U64_MAX - offset + 1) {
 		rbd_warn(rbd_dev, "bad request range (%llu~%llu)", offset,
 			 length);
 		result = -EINVAL;
-		goto err_rq;	/* Shouldn't happen */
+		goto warn_more;	/* Shouldn't happen */
 	}
 
 	blk_mq_start_request(rq);
@@ -4176,7 +4176,7 @@ static void rbd_queue_workfn(struct work_struct *work)
 		rbd_warn(rbd_dev, "beyond EOD (%llu~%llu > %llu)", offset,
 			 length, mapping_size);
 		result = -EIO;
-		goto err_rq;
+		goto warn_more;
 	}
 
 	if (must_be_locked) {
@@ -4189,7 +4189,7 @@ static void rbd_queue_workfn(struct work_struct *work)
 					     snapc);
 	if (!img_request) {
 		result = -ENOMEM;
-		goto err_unlock;
+		goto unlock;
 	}
 	img_request->rq = rq;
 	snapc = NULL; /* img_request consumes a ref */
@@ -4201,27 +4201,30 @@ static void rbd_queue_workfn(struct work_struct *work)
 		result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO,
 					      rq->bio);
 	if (result)
-		goto err_img_request;
+		goto put_request;
 
 	result = rbd_img_request_submit(img_request);
 	if (result)
-		goto err_img_request;
+		goto put_request;
 
 	if (must_be_locked)
 		up_read(&rbd_dev->lock_rwsem);
 	return;
-
-err_img_request:
+ put_request:
 	rbd_img_request_put(img_request);
-err_unlock:
+ unlock:
 	if (must_be_locked)
 		up_read(&rbd_dev->lock_rwsem);
-err_rq:
-	if (result)
-		rbd_warn(rbd_dev, "%s %llx at %llx result %d",
-			 obj_op_name(op_type), length, offset, result);
+ warn_more:
+	rbd_warn(rbd_dev,
+		 "%s %llx at %llx result %d",
+		 obj_op_name(op_type),
+		 length,
+		 offset,
+		 result);
+ put_snap_context:
 	ceph_put_snap_context(snapc);
-err:
+ end_request:
 	blk_mq_end_request(rq, result);
 }
 
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481870 — [PATCH 22/47] block-rbd: Rename a jump label in find_watcher()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:36:23 +0200

Adjust a jump label according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7802351..ba8fb74 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3440,13 +3440,13 @@ static int find_watcher(struct rbd_device *rbd_dev,
 			     rbd_dev, cid.gid, cid.handle);
 			rbd_set_owner_cid(rbd_dev, &cid);
 			ret = 1;
-			goto out;
+			goto free_watchers;
 		}
 	}
 
 	dout("%s rbd_dev %p no watchers\n", __func__, rbd_dev);
 	ret = 0;
-out:
+free_watchers:
 	kfree(watchers);
 	return ret;
 }
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481873 — [PATCH 30/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_callback()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:46:43 +0200

Adjust a jump target so that a duplicate check can then be avoided
at the end.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index f3f2919..7d5f7b9 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2879,7 +2879,7 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
 		obj_request_existence_set(orig_request, false);
 	} else if (result) {
 		orig_request->result = result;
-		goto out;
+		goto complete_request;
 	}
 
 	/*
@@ -2887,8 +2887,8 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
 	 * whether the target object exists.
 	 */
 	orig_request->result = rbd_img_obj_request_submit(orig_request);
-out:
 	if (orig_request->result)
+ complete_request:
 		rbd_obj_request_complete(orig_request);
 }
 
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

#1481875 — [PATCH 29/47] block-rbd: Delete an unnecessary initialisation in rbd_img_obj_exists_submit()

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 12 Sep 2016 19:45:29 +0200

The local variable "pages" will be set to an appropriate pointer
a bit later. Thus omit the explicit initialisation at the beginning.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/rbd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 66801ec..f3f2919 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2897,7 +2897,7 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)
 	struct rbd_obj_request *stat_request;
 	struct rbd_device *rbd_dev;
 	struct ceph_osd_client *osdc;
-	struct page **pages = NULL;
+	struct page **pages;
 	u32 page_count;
 	size_t size;
 	int ret;
-- 
2.10.0

[toc] | [prev] | [next] | [standalone]

Page 1 of 3  [1] 2 3  Next page →

Back to top | Article view | linux.kernel

csiph-web