From patchwork Tue May 7 01:38:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2529801 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 193813FD85 for ; Tue, 7 May 2013 01:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759552Ab3EGBiI (ORCPT ); Mon, 6 May 2013 21:38:08 -0400 Received: from mail-ie0-f178.google.com ([209.85.223.178]:49796 "EHLO mail-ie0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759433Ab3EGBiH (ORCPT ); Mon, 6 May 2013 21:38:07 -0400 Received: by mail-ie0-f178.google.com with SMTP id b11so52368iee.37 for ; Mon, 06 May 2013 18:38:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=ePSO+lM5hke8ljiSae2uzHks5S1B8+Yo0EwkJdLaJ08=; b=Ki2iOiaKT7cCBVbB2re2WopcwLMSjOUZbjYwGkzkAPNh5kqMXFCFGNPWX1Tr9gr7Nr h7oUMWufHu84XS1hOeXh/H0bn4wYnLePFNVtSE/ww2ZRMsY10kphO5jnEA6t6ZqziEq4 5PAY7/bcLFlHxnYGfstr8n8Nka9cmjASdhmDfDfZVn8Zc3Z16x7rr9bkjG/7hF0kncHF hqafkoKTixo5h1bCaALDl7HTHUwhuQluwKRMnQ5UfDwVWm52JQ84tBsFVSfHb8GkzXGp GUJ/HuiP9m2l7wYYOFwWBS/XCMYN+xg1m9S0KTuxGrQ1R4j9KdlsT6bOLgUbRGd8G86i Lx7Q== X-Received: by 10.50.49.5 with SMTP id q5mr1523797ign.106.1367890686080; Mon, 06 May 2013 18:38:06 -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 ESMTPSA id c2sm5186687igv.1.2013.05.06.18.38.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 May 2013 18:38:05 -0700 (PDT) Message-ID: <51885AFC.3050908@inktank.com> Date: Mon, 06 May 2013 20:38:04 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 4/6] rbd: don't look up snapshot id in rbd_dev_mapping_set() References: <51885A97.9070005@inktank.com> In-Reply-To: <51885A97.9070005@inktank.com> X-Gm-Message-State: ALoCoQn7Fb7f+5t3/AfIWVbWY7EXy1R0XC+dQ+/0juIOOcrepOoK8Yhr/CKRH2Udx5zsPBVsVlqJ Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Currently rbd_dev_mapping_set() looks up the snapshot id for the snapshot whose name is found in the rbd device's spec structure. That function gets called by rbd_dev_device_setup(), which is called by rbd_add() *after* rbd_dev_image_probe(). If the image probe succeeds, the rbd device's spec will already have been updated to include names and ids for all fields. Therefore there's no need to look up the snapshot id in rbd_dev_mapping_set(). Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) return ret; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 7d93dbd..5eebf6d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -936,20 +936,11 @@ static int rbd_snap_features(struct rbd_device *rbd_dev, u64 snap_id, static int rbd_dev_mapping_set(struct rbd_device *rbd_dev) { - const char *snap_name = rbd_dev->spec->snap_name; - u64 snap_id; + u64 snap_id = rbd_dev->spec->snap_id; u64 size = 0; u64 features = 0; int ret; - if (strcmp(snap_name, RBD_SNAP_HEAD_NAME)) { - snap_id = rbd_snap_id_by_name(rbd_dev, snap_name); - if (snap_id == CEPH_NOSNAP) - return -ENOENT; - } else { - snap_id = CEPH_NOSNAP; - } - ret = rbd_snap_size(rbd_dev, snap_id, &size); if (ret)