From patchwork Fri Sep 7 21:15:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1425201 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 921513FC71 for ; Fri, 7 Sep 2012 21:15:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757603Ab2IGVPn (ORCPT ); Fri, 7 Sep 2012 17:15:43 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:41314 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756794Ab2IGVPn (ORCPT ); Fri, 7 Sep 2012 17:15:43 -0400 Received: by iahk25 with SMTP id k25so23159iah.19 for ; Fri, 07 Sep 2012 14:15:42 -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=2hPEOmCkMD93PK9PxLODNi9ss4O9zn2MDcDL98JaqXA=; b=MH4eY4m8MW/Ec1bb8YUWtYs9jqbm83NaUmNqOTeGdVKzM0pVRuOu+m5ubtbDl7ZWT+ 6veDmf5KYq9FyVgo9XBfdRmhzHo4nQIU4qJOOOjywmDHq8ttvz74YRAIWFfv/CSRrU7T gjRChkrq/+xkAa8bcBsSsEjvlKyvhCfKPM4tY/HPhbHfagZV/RF57lzt0ktBwd1Vubcw d0kMWGwMZXD04dpkwpqvtnSqkur2bOmk9IpZq0TBGgtgYb5IQ1+rgO0Rmhd4QbiyuO/t FxEL0jGaMpcpKLQCf3LFhJGf/DG7FoK8bgQ+Fm8b04TND49ZHPumcmghC4P5hEfjdYSi pl6A== Received: by 10.50.94.195 with SMTP id de3mr472708igb.68.1347052542714; Fri, 07 Sep 2012 14:15:42 -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 i17sm507519igd.5.2012.09.07.14.15.41 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 14:15:42 -0700 (PDT) Message-ID: <504A63FC.1080005@inktank.com> Date: Fri, 07 Sep 2012 16:15:40 -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 9/9] rbd: activate v2 image support References: <504A6273.7030807@inktank.com> In-Reply-To: <504A6273.7030807@inktank.com> X-Gm-Message-State: ALoCoQmFszp2yF8Ba5pam2XS6YuqXXfUCjLCVICRb90AK+IV1voYXeS+OcZ/Q0AzhkUMHRyX5Kd6 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Now that v2 images support is fully implemented, have rbd_dev_v2_probe() return 0 to indicate a successful probe. Signed-off-by: Alex Elder --- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rbd_dev->header_name = NULL; diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b466393..2f83f71 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2973,7 +2973,7 @@ static int rbd_dev_v2_probe(struct rbd_device *rbd_dev) dout("discovered version 2 image, header name is %s\n", rbd_dev->header_name); - return -ENOTSUPP; + return 0; out_err: kfree(rbd_dev->header_name);