From: Josh Durgin <josh.durgin@inktank.com>
To: Alex Elder <elder@inktank.com>
Cc: ceph-devel@vger.kernel.org
Subject: Re: [PATCH 5/9] rbd: defer setting device id
Date: Tue, 11 Sep 2012 08:03:49 -0700 [thread overview]
Message-ID: <504F52D5.9060905@inktank.com> (raw)
In-Reply-To: <504A167D.7000405@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
On 09/07/2012 08:45 AM, Alex Elder wrote:
> Hold off setting the device id and formatting the device name
> in rbd_add() until just before it's needed.
>
> Signed-off-by: Alex Elder <elder@inktank.com>
> ---
> drivers/block/rbd.c | 44 ++++++++++++++++++++++----------------------
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 89d8ed7..53e5308 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -2549,10 +2549,10 @@ static ssize_t rbd_add(struct bus_type *bus,
>
> options = kmalloc(count, GFP_KERNEL);
> if (!options)
> - goto err_nomem;
> + goto err_out_mem;
> rbd_dev = kzalloc(sizeof(*rbd_dev), GFP_KERNEL);
> if (!rbd_dev)
> - goto err_nomem;
> + goto err_out_mem;
>
> /* static rbd_device initialization */
> spin_lock_init(&rbd_dev->lock);
> @@ -2562,25 +2562,17 @@ static ssize_t rbd_add(struct bus_type *bus,
>
> down_write(&rbd_dev->header_rwsem);
>
> - /* generate unique id: find highest unique id, add one */
> - rbd_dev_id_get(rbd_dev);
> -
> - /* Fill in the device name, now that we have its id. */
> - BUILD_BUG_ON(DEV_NAME_LEN
> - < sizeof (RBD_DRV_NAME) + MAX_INT_FORMAT_WIDTH);
> - sprintf(rbd_dev->name, "%s%d", RBD_DRV_NAME, rbd_dev->dev_id);
> -
> /* parse add command */
> snap_name = rbd_add_parse_args(rbd_dev, buf,
> &mon_addrs, &mon_addrs_size, options, count);
> if (IS_ERR(snap_name)) {
> rc = PTR_ERR(snap_name);
> - goto err_put_id;
> + goto err_out_mem;
> }
>
> rc = rbd_get_client(rbd_dev, mon_addrs, mon_addrs_size - 1, options);
> if (rc < 0)
> - goto err_put_id;
> + goto err_out_args;
>
> /* pick the pool */
> osdc = &rbd_dev->rbd_client->client->osdc;
> @@ -2612,10 +2604,19 @@ static ssize_t rbd_add(struct bus_type *bus,
> if (rc)
> goto err_out_header;
>
> - /* register our block device */
> + /* generate unique id: find highest unique id, add one */
> + rbd_dev_id_get(rbd_dev);
> +
> + /* Fill in the device name, now that we have its id. */
> + BUILD_BUG_ON(DEV_NAME_LEN
> + < sizeof (RBD_DRV_NAME) + MAX_INT_FORMAT_WIDTH);
> + sprintf(rbd_dev->name, "%s%d", RBD_DRV_NAME, rbd_dev->dev_id);
> +
> + /* Get our block major device number. */
> +
> rc = register_blkdev(0, rbd_dev->name);
> if (rc < 0)
> - goto err_out_header;
> + goto err_out_id;
> rbd_dev->major = rc;
>
> rc = rbd_bus_add_dev(rbd_dev);
> @@ -2663,20 +2664,19 @@ err_out_bus:
>
> err_out_blkdev:
> unregister_blkdev(rbd_dev->major, rbd_dev->name);
> +err_out_id:
> + rbd_dev_id_put(rbd_dev);
> err_out_header:
> rbd_header_free(&rbd_dev->header);
> err_out_client:
> kfree(rbd_dev->header_name);
> rbd_put_client(rbd_dev);
> -err_put_id:
> - if (rbd_dev->pool_name) {
> - kfree(rbd_dev->mapping.snap_name);
> - kfree(rbd_dev->image_name);
> - kfree(rbd_dev->pool_name);
> - }
> - rbd_dev_id_put(rbd_dev);
> +err_out_args:
> + kfree(rbd_dev->mapping.snap_name);
> + kfree(rbd_dev->image_name);
> + kfree(rbd_dev->pool_name);
> up_write(&rbd_dev->header_rwsem);
> -err_nomem:
> +err_out_mem:
> kfree(rbd_dev);
> kfree(options);
>
next prev parent reply other threads:[~2012-09-11 15:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-07 15:39 [PATCH 0/9] rbd: rearrange initialization sequence Alex Elder
2012-09-07 15:44 ` [PATCH 1/9] rbd: assign header name later Alex Elder
2012-09-10 22:41 ` Josh Durgin
2012-09-07 15:44 ` [PATCH 2/9] rbd: defer registering snapshot devices Alex Elder
2012-09-11 14:56 ` Josh Durgin
2012-09-07 15:44 ` [PATCH 3/9] rbd: call set_snap() before snap_devs_update() Alex Elder
2012-09-11 14:58 ` Josh Durgin
2012-09-07 15:44 ` [PATCH 4/9] rbd: read the header before registering device Alex Elder
2012-09-11 15:02 ` Josh Durgin
2012-09-07 15:45 ` [PATCH 5/9] rbd: defer setting device id Alex Elder
2012-09-11 15:03 ` Josh Durgin [this message]
2012-09-07 15:45 ` [PATCH 6/9] rbd: call rbd_init_disk() sooner Alex Elder
2012-09-11 15:06 ` Josh Durgin
2012-09-07 15:45 ` [PATCH 7/9] rbd: drop dev registration check for new snap Alex Elder
2012-09-11 15:07 ` Josh Durgin
2012-09-07 15:45 ` [PATCH 8/9] rbd: set initial capacity in rbd_init_disk() Alex Elder
2012-09-11 15:07 ` Josh Durgin
2012-09-07 15:45 ` [PATCH 9/9] rbd: set up watch before announcing disk Alex Elder
2012-09-11 15:08 ` Josh Durgin
2012-09-07 15:50 ` [PATCH 0/9] rbd: rearrange initialization sequence Alex Elder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=504F52D5.9060905@inktank.com \
--to=josh.durgin@inktank.com \
--cc=ceph-devel@vger.kernel.org \
--cc=elder@inktank.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.