From patchwork Fri Sep 7 15:45:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1423601 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 68F9E3FC85 for ; Fri, 7 Sep 2012 15:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752645Ab2IGPpW (ORCPT ); Fri, 7 Sep 2012 11:45:22 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:57175 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751857Ab2IGPpU (ORCPT ); Fri, 7 Sep 2012 11:45:20 -0400 Received: by ieje11 with SMTP id e11so5262969iej.19 for ; Fri, 07 Sep 2012 08:45:20 -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=eRQ1gtX9QoeuxbNqhnDgmQ8O+CA/T5TnXwpkUybKNaw=; b=Rx4u366e/1gMvcpLXeoHNrHmCdVdfowUelBUPCq+krPlKWtAdEAvASErweEMxu2DEO hO+ZM32Gk5/3XjVOr5r0bpX5PPTuQDjTEhKNSDguwZf0vlpASdmZidhhLEe7S62ENXoE nAbn4CojypTOC1In5Yzgk6sbd7tDJNqJexQfY7FTz0bhPJPfbZCOGDExiMh3NdHnrXuW DsD+bcrfA9Svl2z/aliIi6TqOA8+p8+VsYqkZ9PthPpBNsKUvpE5eZgSqMScWYpEITPO SwkG2gxKyGbn/5R+39JoppLcGISD46StEUVGIpvBqOFgJHq46YfjVNv1efPRVJnGCUNm jSlg== Received: by 10.42.54.3 with SMTP id p3mr7518770icg.41.1347032720493; Fri, 07 Sep 2012 08:45:20 -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 bp8sm13582843igb.12.2012.09.07.08.45.19 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 08:45:19 -0700 (PDT) Message-ID: <504A168E.6090906@inktank.com> Date: Fri, 07 Sep 2012 10:45:18 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 7/9] rbd: drop dev registration check for new snap References: <504A152E.4000905@inktank.com> In-Reply-To: <504A152E.4000905@inktank.com> X-Gm-Message-State: ALoCoQkHGose166+Fknb4Oy9Vw5SceoBykPPH5AUbZNDJM/Z+vhtrSl689/U60tahsR985gypKTa Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) if (!rbd_snap_registered(snap)) { 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) {