From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [PATCH 1/4] rbd: move locking out of rbd_header_set_snap() Date: Mon, 10 Sep 2012 14:57:40 -0700 Message-ID: <504E6254.8000504@inktank.com> References: <504A090F.7000706@inktank.com> <504A09A4.7050404@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-pb0-f46.google.com ([209.85.160.46]:38627 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752264Ab2IJV5n (ORCPT ); Mon, 10 Sep 2012 17:57:43 -0400 Received: by pbbrr13 with SMTP id rr13so3101805pbb.19 for ; Mon, 10 Sep 2012 14:57:43 -0700 (PDT) In-Reply-To: <504A09A4.7050404@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 07:50 AM, Alex Elder wrote: > Move the calls to get the header semaphore out of > rbd_header_set_snap() and into its caller. > > Signed-off-by: Alex Elder > --- > drivers/block/rbd.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 634a16c..214c937 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -647,8 +647,6 @@ static int rbd_header_set_snap(struct rbd_device > *rbd_dev, char *snap_name) > { > int ret; > > - down_write(&rbd_dev->header_rwsem); > - > if (!memcmp(snap_name, RBD_SNAP_HEAD_NAME, > sizeof (RBD_SNAP_HEAD_NAME))) { > rbd_dev->mapping.snap_id = CEPH_NOSNAP; > @@ -666,7 +664,6 @@ static int rbd_header_set_snap(struct rbd_device > *rbd_dev, char *snap_name) > > ret = 0; > done: > - up_write(&rbd_dev->header_rwsem); > return ret; > } > > @@ -2608,7 +2605,9 @@ static ssize_t rbd_add(struct bus_type *bus, > if (rc) > goto err_out_bus; > > + down_write(&rbd_dev->header_rwsem); > rc = rbd_header_set_snap(rbd_dev, snap_name); > + up_write(&rbd_dev->header_rwsem); > if (rc) > goto err_out_bus; >