From patchwork Tue Oct 9 21:01:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1571611 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 26D57DFFAD for ; Tue, 9 Oct 2012 21:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756622Ab2JIVB3 (ORCPT ); Tue, 9 Oct 2012 17:01:29 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34485 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756508Ab2JIVB3 (ORCPT ); Tue, 9 Oct 2012 17:01:29 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so5612010pad.19 for ; Tue, 09 Oct 2012 14:01:29 -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=C7RPuxyowdaw3rOpnBWFRsg5Uc54ogaEbuO8uvKOn04=; b=adH0Zqsnr4kmoROgMW6G3D/bxYopdnX5QBmpfJuoL7vtXs7aQ2bMxM7rXF1uZe0PqH HsnVL+sE/87Sndm+GpTCFOddwpmm18FSstdA0aXkDgbDhdozUCfms6TQbCwclMxF1AII TTFQI7ADggQlvHMEiGrK0hKLHJZ9Of6q52X1Y7RqBQ8/q1uydRvIZVZrD61cISMJrRyL Dy7/ewpkk/pCo0V5HHuLt1XxWsPWM8k0SC75yqRleifAJ4grOA19xH5VqYyElXPn23mi l8K5LT8iZCOIwqljvfae+ekHfkIX2S+P7ljuwSXe0EH30zPqWbWwc3RKbqGXdWR/iqBX R03g== Received: by 10.68.211.163 with SMTP id nd3mr65212309pbc.84.1349816489117; Tue, 09 Oct 2012 14:01:29 -0700 (PDT) Received: from ?IPv6:2607:f298:a:607:4823:f93f:93c7:61da? ([2607:f298:a:607:4823:f93f:93c7:61da]) by mx.google.com with ESMTPS id h10sm13095294pav.28.2012.10.09.14.01.23 (version=SSLv3 cipher=OTHER); Tue, 09 Oct 2012 14:01:25 -0700 (PDT) Message-ID: <507490A2.4000202@inktank.com> Date: Tue, 09 Oct 2012 14:01:22 -0700 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120912 Thunderbird/15.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 4/4] rbd: activate v2 image support References: <50748FA5.4030508@inktank.com> In-Reply-To: <50748FA5.4030508@inktank.com> X-Gm-Message-State: ALoCoQm2NsQFWrYTmH/TMpMr+YAA7Qth7w02HnHBON5j/ZnsHJ4ENuVNcaxWbQ/ErJwrNTXjUgp6 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. (Note that an image that implements layering will fail the probe early because of the feature chekc.) Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- 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 86ab032..6052fff 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3013,7 +3013,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);