From mboxrd@z Thu Jan 1 00:00:00 1970 From: Josh Durgin Subject: Re: [PATCH 7/9] rbd: drop dev registration check for new snap Date: Tue, 11 Sep 2012 08:07:03 -0700 Message-ID: <504F5397.9040901@inktank.com> References: <504A152E.4000905@inktank.com> <504A168E.6090906@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]:48873 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752889Ab2IKPHL (ORCPT ); Tue, 11 Sep 2012 11:07:11 -0400 Received: by pbbrr13 with SMTP id rr13so916166pbb.19 for ; Tue, 11 Sep 2012 08:07:10 -0700 (PDT) In-Reply-To: <504A168E.6090906@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:45 AM, Alex Elder wrote: > By the time rbd_dev_snaps_register() gets called during rbd device > initialization, the main device will have already been registered. > Similarly, a header refresh will only occur for an rbd device whose > Linux device is registered. There is therefore no need to verify > the main device is registered when registering a snapshot device. > > For the time being, turn the check into a WARN_ON(), but it can > eventually just go away. > > Signed-off-by: Alex Elder > --- > drivers/block/rbd.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 8e82610..e6af38f 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -2253,8 +2253,8 @@ static int rbd_dev_snaps_register(struct > rbd_device *rbd_dev) > int ret = 0; > > dout("%s called\n", __func__); > - if (!device_is_registered(&rbd_dev->dev)) > - return 0; > + if (WARN_ON(!device_is_registered(&rbd_dev->dev))) > + return -EIO; > > list_for_each_entry(snap, &rbd_dev->snaps, node) { > if (!rbd_snap_registered(snap)) { >