From patchwork Fri Oct 26 22:55:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1654361 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7582CDF2F6 for ; Fri, 26 Oct 2012 22:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934196Ab2JZWzt (ORCPT ); Fri, 26 Oct 2012 18:55:49 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:49629 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934127Ab2JZWzs (ORCPT ); Fri, 26 Oct 2012 18:55:48 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so4479692iea.19 for ; Fri, 26 Oct 2012 15:55:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=okzKEvcssX/A7RTFpB8sXi+osnTfc+Alns/43hw2RZE=; b=eeLDnlV9cYguLZ9sFFNHXh1KcOi3mekdfHVSBXdtr2M+4hQwwyTPK8uzlr8Uqc/8Wq GTUeQM5bIjyt/IyMj0rJbThWgxnKsW6iYRmV1XUQyp7nCkcNvQXAlGA66Mcsv7ca1ayr bFiZjR2KG3qSdLPm0o4wtQ5I6tdCQtF4aC2o/4eAeosH2XJH4n7NTCSGLioXbxWC0beK 0gblNUkpwSiia8ihb9GyyYXTOrYIpWbdWCh6XbysezMnqdRINQ7WlABwTeIjaMhSkroG d/Re/bIqvk5UxuqpmBBT0Ns2I80w87k2oW5KmwrzQSQEinHNwHAWvqpwR9X20NMdJoD6 uRWw== Received: by 10.50.219.233 with SMTP id pr9mr3735505igc.19.1351292147765; Fri, 26 Oct 2012 15:55:47 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id l8sm177682igo.13.2012.10.26.15.55.46 (version=SSLv3 cipher=OTHER); Fri, 26 Oct 2012 15:55:46 -0700 (PDT) Message-ID: <508B14F1.8050008@inktank.com> Date: Fri, 26 Oct 2012 17:55:45 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 1/2] rbd: move ceph_parse_options() call up References: <508B11E3.3040108@inktank.com> <508B142D.7080907@inktank.com> In-Reply-To: <508B142D.7080907@inktank.com> X-Gm-Message-State: ALoCoQmvTCbNnd0mAFNXUMMp67Mt5BkVWf/9Mz6Df3t/bb/8NIVjIb0Ub8i63A5Hzi34Ax85Rnez Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Move option parsing out of rbd_get_client() and into its caller. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) /* 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); 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) {