From patchwork Thu Jul 19 21:08:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1218601 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 2EA823FD48 for ; Thu, 19 Jul 2012 21:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751855Ab2GSVIz (ORCPT ); Thu, 19 Jul 2012 17:08:55 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:40265 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739Ab2GSVIy (ORCPT ); Thu, 19 Jul 2012 17:08:54 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so3302595yen.19 for ; Thu, 19 Jul 2012 14:08:54 -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=XaglNND9qTrmluqqEepHzhA07Cn4RejqtSNZTG79x+U=; b=QG/2ZZ3lcPquKOb26JYw3zKZ1Njg8gp3b0PWi/2MJnKD9f2JbvxTwnuFPpGboTfSLh xmEzMqa5dEEStEEGBAbqxSqR6qJtSg8YuwG3dS7RQIdqN1MAKEvqe7stjeJEFezkr1Rk vD1Hrw2VJ9D/JdtNwrtuZUe02sm5lfLGo+/DVkN8fcDkqmcRREN1Oyp/S0kFyQSoh1NU vLxwCenZwfBTo3TC33GS41i8eMuDix1a2Yw2arlswR+652zBaFEsyQvd30nyFzIR/YE8 6ZgKi6SXTiAlF49iDrmA1favdAvTgJBpAMEpzaAnpSSvHsMb3lKwX++MKgm9nxsMioIG 3Xdg== Received: by 10.43.106.147 with SMTP id du19mr2141455icc.56.1342732134065; Thu, 19 Jul 2012 14:08:54 -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 dc7sm17811397igc.13.2012.07.19.14.08.53 (version=SSLv3 cipher=OTHER); Thu, 19 Jul 2012 14:08:53 -0700 (PDT) Message-ID: <50087765.9050307@inktank.com> Date: Thu, 19 Jul 2012 16:08:53 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 09/12] rbd: have __rbd_add_snap_dev() return a pointer References: <500874F5.4090205@inktank.com> In-Reply-To: <500874F5.4090205@inktank.com> X-Gm-Message-State: ALoCoQmQAVHPC6T/8K2nuuEO6cCu+js+luvEjC56oFkIt7OyiyrYRBCGYv/idNyLMwjFO55WNhWp Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org It's not obvious whether the snapshot pointer whose address is provided to __rbd_add_snap_dev() will be assigned by that function. Change it to return the snapshot, or a pointer-coded errno in the event of a failure. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) if (device_is_registered(&rbd_dev->dev)) { @@ -2034,12 +2040,14 @@ static int __rbd_add_snap_dev(struct rbd_device *rbd_dev, if (ret < 0) goto err; } - *snapp = snap; - return 0; + + return snap; + err: kfree(snap->name); kfree(snap); - return ret; + + return ERR_PTR(ret); } /* @@ -2072,7 +2080,6 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev) const char *name, *first_name; int i = rbd_dev->header.total_snaps; struct rbd_snap *snap, *old_snap = NULL; - int ret; struct list_head *p, *n; first_name = rbd_dev->header.snap_names; @@ -2115,9 +2122,9 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev) if (cur_id >= old_snap->id) break; /* a new snapshot */ - ret = __rbd_add_snap_dev(rbd_dev, i - 1, name, &snap); - if (ret < 0) - return ret; + snap = __rbd_add_snap_dev(rbd_dev, i - 1, name); + if (IS_ERR(snap)) + return PTR_ERR(snap); /* note that we add it backward so using n and not p */ list_add(&snap->node, n); @@ -2131,9 +2138,9 @@ static int __rbd_init_snaps_header(struct rbd_device *rbd_dev) WARN_ON(1); return -EINVAL; } - ret = __rbd_add_snap_dev(rbd_dev, i - 1, name, &snap); - if (ret < 0) - return ret; + snap = __rbd_add_snap_dev(rbd_dev, i - 1, name); + if (IS_ERR(snap)) + return PTR_ERR(snap); list_add(&snap->node, &rbd_dev->snaps); } diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index d4a8d9e..79b0762 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2018,15 +2018,21 @@ static int rbd_register_snap_dev(struct rbd_snap *snap, return ret; } -static int __rbd_add_snap_dev(struct rbd_device *rbd_dev, - int i, const char *name, - struct rbd_snap **snapp) +static struct rbd_snap *__rbd_add_snap_dev(struct rbd_device *rbd_dev, + int i, const char *name) { + struct rbd_snap *snap; int ret; - struct rbd_snap *snap = kzalloc(sizeof(*snap), GFP_KERNEL); + + snap = kzalloc(sizeof (*snap), GFP_KERNEL); if (!snap) - return -ENOMEM; + return ERR_PTR(-ENOMEM); + + ret = -ENOMEM; snap->name = kstrdup(name, GFP_KERNEL); + if (!snap->name) + goto err; + snap->size = rbd_dev->header.snap_sizes[i]; snap->id = rbd_dev->header.snapc->snaps[i];