From patchwork Mon Oct 22 16:44:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1627061 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 37548DFB79 for ; Mon, 22 Oct 2012 16:45:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241Ab2JVQpB (ORCPT ); Mon, 22 Oct 2012 12:45:01 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:60515 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753371Ab2JVQpA (ORCPT ); Mon, 22 Oct 2012 12:45:00 -0400 Received: by mail-ia0-f174.google.com with SMTP id y32so2208733iag.19 for ; Mon, 22 Oct 2012 09:45:00 -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=+Ghzm7u2X/Pn3tIgc/zBi+knZ448cpRIR3hLUOonw6M=; b=UdeLcGIxPsgVKyIVy1gShA01nbQ2UzWf1i5jO6OLiAbMJvWowj5USaPS/3M0fDq2E6 IDkUiGMfiywZnFf7vTwm+LwuMyE7nnTTdDkDm8lOVHtXolh1pptD7ZG3yr90qMJK38/0 oCYiYWsvCXVEqasvB+SGdRXwMKsvF8T6RnGHeTN9Rh9Pt700/1CyrbkJFK8Rnh8Ytf7q 2i37BCR/dF01LJ83neagkk9LbtB/SN93rPv9v7Q1YY9RwUa/MuynrKWLHo+sxYwfO/KF 4p5ost4ePTmfRNBAYs3AjD6fbXKII8GAqfKs4QPuJpBBPrOmpyzrVnZoGB+wuO/NyL+p i0ew== Received: by 10.50.149.198 with SMTP id uc6mr4079931igb.43.1350924299846; Mon, 22 Oct 2012 09:44:59 -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 uj11sm22839898igb.15.2012.10.22.09.44.58 (version=SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:44:59 -0700 (PDT) Message-ID: <50857809.2010303@inktank.com> Date: Mon, 22 Oct 2012 11:44:57 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 2/2] rbd: fix read-only option name References: <508577B6.2020708@inktank.com> In-Reply-To: <508577B6.2020708@inktank.com> X-Gm-Message-State: ALoCoQkU3tnnGXpIRnON0zodI89FVy7OkAgNq3gfFBeGZ+vd325cx1BZDuw5ggLMkhAZcwY7VGPO Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org The name of the "read-only" mapping option was inadvertently changed in this commit: f84344f3 rbd: separate mapping info in rbd_dev Revert that hunk to return it to what it should be. Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 65e9f1f..d032883 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -397,7 +397,7 @@ enum { static match_table_t rbd_opts_tokens = { /* int args above */ /* string args above */ - {Opt_read_only, "mapping.read_only"}, + {Opt_read_only, "read_only"}, {Opt_read_only, "ro"}, /* Alternate spelling */ {Opt_read_write, "read_write"}, {Opt_read_write, "rw"}, /* Alternate spelling */