From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [PATCH 3/9] rbd: call set_snap() before snap_devs_update() Date: Tue, 11 Sep 2012 07:58:02 -0700 Message-ID: <504F517A.7020207@inktank.com> References: <504A152E.4000905@inktank.com> <504A1669.7030300@inktank.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pz0-f46.google.com ([209.85.210.46]:62591 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759295Ab2IKO6E (ORCPT ); Tue, 11 Sep 2012 10:58:04 -0400 Received: by dady13 with SMTP id y13so360802dad.19 for ; Tue, 11 Sep 2012 07:58:04 -0700 (PDT) In-Reply-To: <504A1669.7030300@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Alex Elder Cc: ceph-devel@vger.kernel.org Reviewed-by: Josh Durgin On 09/07/2012 08:44 AM, Alex Elder wrote: > rbd_header_set_snap() is a simple initialization routine for an rbd > device's mapping. It has to be called after the snapshot context > for the rbd_dev has been updated, but can be done before snapshot > devices have been registered. > > Change the name to rbd_dev_set_mapping() to better reflect its > purpose, and call it a little sooner, before registering snapshot > devices. > > Signed-off-by: Alex Elder > --- > drivers/block/rbd.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index d03fb0f..d60db25 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -640,7 +640,7 @@ static int snap_by_name(struct rbd_device *rbd_dev, > const char *snap_name) > return -ENOENT; > } > > -static int rbd_header_set_snap(struct rbd_device *rbd_dev, char *snap_name) > +static int rbd_dev_set_mapping(struct rbd_device *rbd_dev, char *snap_name) > { > int ret; > > @@ -2621,11 +2621,12 @@ static ssize_t rbd_add(struct bus_type *bus, > rc = rbd_dev_snaps_update(rbd_dev); > if (rc) > goto err_out_unlock; > - rc = rbd_dev_snaps_register(rbd_dev); > + > + rc = rbd_dev_set_mapping(rbd_dev, snap_name); > if (rc) > goto err_out_unlock; > > - rc = rbd_header_set_snap(rbd_dev, snap_name); > + rc = rbd_dev_snaps_register(rbd_dev); > if (rc) > goto err_out_unlock; >