From: Josh Durgin <josh.durgin@inktank.com>
To: Alex Elder <elder@inktank.com>
Cc: ceph-devel@vger.kernel.org
Subject: Re: [PATCH 1/2] rbd: move ceph_parse_options() call up
Date: Mon, 29 Oct 2012 14:08:11 -0700 [thread overview]
Message-ID: <508EF03B.8040203@inktank.com> (raw)
In-Reply-To: <508B14F1.8050008@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
On 10/26/2012 03:55 PM, Alex Elder wrote:
> Move option parsing out of rbd_get_client() and into its caller.
>
> Signed-off-by: Alex Elder <elder@inktank.com>
> ---
> drivers/block/rbd.c | 48 +++++++++++++++++++++++++++---------------------
> 1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index fb44d4d..6e36c63 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -453,27 +453,11 @@ static int parse_rbd_opts_token(char *c, void
> *private)
> * Get a ceph client with specific addr and configuration, if one does
> * not exist create it.
> */
> -static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr,
> - size_t mon_addr_len, char *options)
> +static int rbd_get_client(struct rbd_device *rbd_dev,
> + struct ceph_options *ceph_opts)
> {
> - struct rbd_options rbd_opts;
> - struct ceph_options *ceph_opts;
> struct rbd_client *rbdc;
>
> - /* Initialize all rbd options to the defaults */
> -
> - rbd_opts.read_only = RBD_READ_ONLY_DEFAULT;
> -
> - ceph_opts = ceph_parse_options(options, mon_addr,
> - mon_addr + mon_addr_len,
> - parse_rbd_opts_token, &rbd_opts);
> - if (IS_ERR(ceph_opts))
> - return PTR_ERR(ceph_opts);
> -
> - /* Record the parsed rbd options */
> -
> - rbd_dev->mapping.read_only = rbd_opts.read_only;
> -
> rbdc = rbd_client_find(ceph_opts);
> if (rbdc) {
> /* using an existing client */
> @@ -3132,9 +3116,11 @@ static ssize_t rbd_add(struct bus_type *bus,
> struct rbd_device *rbd_dev = NULL;
> const char *mon_addrs = NULL;
> size_t mon_addrs_size = 0;
> + char *snap_name;
> + struct rbd_options rbd_opts;
> + struct ceph_options *ceph_opts;
> struct ceph_osd_client *osdc;
> int rc = -ENOMEM;
> - char *snap_name;
>
> if (!try_module_get(THIS_MODULE))
> return -ENODEV;
> @@ -3160,9 +3146,26 @@ static ssize_t rbd_add(struct bus_type *bus,
> goto err_out_mem;
> }
>
> - rc = rbd_get_client(rbd_dev, mon_addrs, mon_addrs_size - 1, options);
> - if (rc < 0)
> + /* Initialize all rbd options to the defaults */
> +
> + rbd_opts.read_only = RBD_READ_ONLY_DEFAULT;
> +
> + ceph_opts = ceph_parse_options(options, mon_addrs,
> + mon_addrs + mon_addrs_size - 1,
> + parse_rbd_opts_token, &rbd_opts);
> + if (IS_ERR(ceph_opts)) {
> + rc = PTR_ERR(ceph_opts);
> goto err_out_args;
> + }
> +
> + /* Record the parsed rbd options */
> +
> + rbd_dev->mapping.read_only = rbd_opts.read_only;
> +
> + rc = rbd_get_client(rbd_dev, ceph_opts);
> + if (rc < 0)
> + goto err_out_opts;
> + ceph_opts = NULL; /* ceph_opts now owned by rbd_dev client */
>
> /* pick the pool */
> osdc = &rbd_dev->rbd_client->client->osdc;
> @@ -3254,6 +3257,9 @@ err_out_client:
> kfree(rbd_dev->header_name);
> rbd_put_client(rbd_dev);
> kfree(rbd_dev->image_id);
> +err_out_opts:
> + if (ceph_opts)
> + ceph_destroy_options(ceph_opts);
> err_out_args:
> kfree(rbd_dev->snap_name);
> kfree(rbd_dev->image_name);
>
next prev parent reply other threads:[~2012-10-29 21:08 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-26 22:42 Another pile of patches Alex Elder
2012-10-26 22:44 ` [PATCH, resend] rbd: simplify rbd_rq_fn() Alex Elder
2012-10-29 20:29 ` Josh Durgin
2012-10-30 12:01 ` Alex Elder
2012-10-26 22:45 ` [PATCH] rbd: remove snapshots on error in rbd_add() Alex Elder
2012-10-29 20:36 ` Josh Durgin
2012-10-26 22:45 ` [PATCH] rbd: make pool_id a 64 bit value Alex Elder
2012-10-29 20:40 ` Josh Durgin
2012-10-26 22:48 ` [PATCH 0/2] rbd: mapping structure changes Alex Elder
2012-10-26 22:51 ` [PATCH 1/2] rbd: move snap info out of rbd_mapping struct Alex Elder
2012-10-29 20:43 ` Josh Durgin
2012-10-26 22:51 ` [PATCH 2/2] rbd: rename snap_exists field Alex Elder
2012-10-29 20:46 ` Josh Durgin
2012-10-26 22:52 ` [PATCH 0/2] rbd: consolidate argument parsing Alex Elder
2012-10-26 22:55 ` [PATCH 1/2] rbd: move ceph_parse_options() call up Alex Elder
2012-10-29 21:08 ` Josh Durgin [this message]
2012-10-26 22:55 ` [PATCH 2/2] rbd: do all argument parsing in one place Alex Elder
2012-10-29 21:13 ` Josh Durgin
2012-10-26 22:56 ` [PATCH 0/8] rbd: have rbd_add_parse_args() only parse args Alex Elder
2012-10-26 23:00 ` [PATCH 1/8] rbd: get rid of snap_name_len Alex Elder
2012-10-29 21:14 ` Josh Durgin
2012-10-26 23:00 ` [PATCH 2/8] rbd: remove options args from rbd_add_parse_args() Alex Elder
2012-10-29 21:17 ` Josh Durgin
2012-10-26 23:01 ` [PATCH 3/8] rbd: remove snap_name arg " Alex Elder
2012-10-29 21:26 ` Josh Durgin
2012-10-26 23:02 ` [PATCH 4/8] rbd: pass and populate rbd_options structure Alex Elder
2012-10-29 21:27 ` Josh Durgin
2012-10-26 23:02 ` [PATCH 5/8] rbd: have rbd_add_parse_args() return error Alex Elder
2012-10-29 21:28 ` Josh Durgin
2012-10-26 23:03 ` [PATCH 6/8] rbd: define image specification structure Alex Elder
2012-10-29 22:13 ` Josh Durgin
2012-10-30 12:40 ` Alex Elder
2012-10-30 20:13 ` Josh Durgin
2012-10-26 23:03 ` [PATCH 7/8] rbd: add reference counting to rbd_spec Alex Elder
2012-10-29 22:20 ` Josh Durgin
2012-10-30 12:59 ` Alex Elder
2012-10-30 20:17 ` Josh Durgin
2012-10-26 23:03 ` [PATCH 8/8] rbd: fill rbd_spec in rbd_add_parse_args() Alex Elder
2012-10-29 22:30 ` Josh Durgin
2012-10-30 13:09 ` Alex Elder
2012-10-30 20:18 ` Josh Durgin
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=508EF03B.8040203@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox