From patchwork Fri Oct 26 23:01:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1654401 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2E1A340135 for ; Fri, 26 Oct 2012 23:01:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934221Ab2JZXBm (ORCPT ); Fri, 26 Oct 2012 19:01:42 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:36774 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934218Ab2JZXBm (ORCPT ); Fri, 26 Oct 2012 19:01:42 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so4484362iea.19 for ; Fri, 26 Oct 2012 16:01:41 -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=c7kRzw/uXWgIrS/CfV+cr+C/16jMvMKE4JhWarrpZO4=; b=Mpt7kpzjJvUMBTtWhR5OxXChToRVqY6/Vz9zLRw6PTRnqVAWShbE4hRGsVz4ZtFFMc ChXhyvWvtBSKZ9j88sAW1T5dbdfpiwFOLuYBkP0V1rS3Si5S/297ki7FA9tt6atys20R m1UJgprhzz0WoH+fvqMzQgkPjTp7/H5MMjpY/+7gadH+bGihZ14wz0r+SJ+FxrLllcNJ TGU/ChLHMvsgBrdwDrAEyIVUlL2I6W8+cys5tzxBfllnJhgPegTHPN52FBayxSpmEHDl Fkt+jmoSFpScF5mwzn8O0RadhobNAQgB3PibieCjj7AUDkCmkZLeJfqkVLy/acalg/T1 8WZw== Received: by 10.42.80.207 with SMTP id w15mr20537966ick.40.1351292501610; Fri, 26 Oct 2012 16:01:41 -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 dq9sm214203igc.5.2012.10.26.16.01.40 (version=SSLv3 cipher=OTHER); Fri, 26 Oct 2012 16:01:40 -0700 (PDT) Message-ID: <508B1653.7000709@inktank.com> Date: Fri, 26 Oct 2012 18:01:39 -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 3/8] rbd: remove snap_name arg from rbd_add_parse_args() References: <508B11E3.3040108@inktank.com> <508B1505.20209@inktank.com> In-Reply-To: <508B1505.20209@inktank.com> X-Gm-Message-State: ALoCoQkmBHnDIzgqxFWUbjmH71xDDP57Ri4AWoNn1XaJ5Jzdv5c3vfT2fEBucB8BQwuVYNQ8/JFe Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The snapshot name returned by rbd_add_parse_args() just gets saved in the rbd_dev eventually. So just do that inside that function and do away with the snap_name argument, both in rbd_add_parse_args() and rbd_dev_set_mapping(). Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) return ret; @@ -2843,8 +2842,7 @@ static inline char *dup_token(const char **buf, size_t *lenp) * Note: rbd_dev is assumed to have been initially zero-filled. */ static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev, - const char *buf, - char **snap_name) + const char *buf) { size_t len; const char *mon_addrs; @@ -2893,11 +2891,11 @@ static struct ceph_options *rbd_add_parse_args(struct rbd_device *rbd_dev, err_ptr = ERR_PTR(-ENAMETOOLONG); goto out_err; } - *snap_name = kmalloc(len + 1, GFP_KERNEL); - if (!*snap_name) + rbd_dev->snap_name = kmalloc(len + 1, GFP_KERNEL); + if (!rbd_dev->snap_name) goto out_mem; - memcpy(*snap_name, buf, len); - *(*snap_name + len) = '\0'; + memcpy(rbd_dev->snap_name, buf, len); + *(rbd_dev->snap_name + len) = '\0'; /* Initialize all rbd options to the defaults */ @@ -3132,7 +3130,6 @@ static ssize_t rbd_add(struct bus_type *bus, size_t count) { struct rbd_device *rbd_dev = NULL; - char *snap_name; struct ceph_options *ceph_opts; struct ceph_osd_client *osdc; int rc = -ENOMEM; @@ -3151,7 +3148,7 @@ static ssize_t rbd_add(struct bus_type *bus, init_rwsem(&rbd_dev->header_rwsem); /* parse add command */ - ceph_opts = rbd_add_parse_args(rbd_dev, buf, &snap_name); + ceph_opts = rbd_add_parse_args(rbd_dev, buf); if (IS_ERR(ceph_opts)) { rc = PTR_ERR(ceph_opts); goto err_out_mem; @@ -3178,7 +3175,7 @@ static ssize_t rbd_add(struct bus_type *bus, if (rc) goto err_out_probe; - rc = rbd_dev_set_mapping(rbd_dev, snap_name); + rc = rbd_dev_set_mapping(rbd_dev); if (rc) goto err_out_snaps; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index f900f3b..948a084 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -665,23 +665,22 @@ static int snap_by_name(struct rbd_device *rbd_dev, const char *snap_name) return -ENOENT; } -static int rbd_dev_set_mapping(struct rbd_device *rbd_dev, char *snap_name) +static int rbd_dev_set_mapping(struct rbd_device *rbd_dev) { int ret; - if (!memcmp(snap_name, RBD_SNAP_HEAD_NAME, + if (!memcmp(rbd_dev->snap_name, RBD_SNAP_HEAD_NAME, sizeof (RBD_SNAP_HEAD_NAME))) { rbd_dev->snap_id = CEPH_NOSNAP; rbd_dev->mapping.size = rbd_dev->header.image_size; rbd_dev->mapping.features = rbd_dev->header.features; ret = 0; } else { - ret = snap_by_name(rbd_dev, snap_name); + ret = snap_by_name(rbd_dev, rbd_dev->snap_name); if (ret < 0) goto done; rbd_dev->mapping.read_only = true; } - rbd_dev->snap_name = snap_name; rbd_dev->exists = true; done: