From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE555C433E0 for ; Thu, 18 Jun 2020 01:57:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A358922228 for ; Thu, 18 Jun 2020 01:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592445431; bh=jWFs75JOAHtYfaPlA8GfTgBuVl9fnOFUDvX/2L3M4yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FBPfBV029CP4W/OFq4jnZfMta7cRBQ00PRJdywuNgSXFT0PcspOvM+/5h4+WWSXoa urqBILP42LLuD26e0EwEmkC3JAIbt0nNNpSWmt+mjOXL2qqzu3slVHjQYeikrZNyMo CCj/GqXZAgv/PEn80B2RNkS/Ymn9S4RW7GWKqxU0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730301AbgFRB5I (ORCPT ); Wed, 17 Jun 2020 21:57:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:60290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731376AbgFRBZN (ORCPT ); Wed, 17 Jun 2020 21:25:13 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 916F621974; Thu, 18 Jun 2020 01:25:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443513; bh=jWFs75JOAHtYfaPlA8GfTgBuVl9fnOFUDvX/2L3M4yU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dvi/q1gLBi/rcJtyWNFnpvGqLlG0SmFr9Dp7/kOoXY9LiYsP16LqMQ4iy97/htbhp iVK7w3wpPQtHovxpUK6qMrkKk5UDOFKSOtz5+SQoOnulDfGCp/NHA4sa1ugBxAqACG 9ntZSu1ZDEFuOj7w4hmlzYkjQy6YeBZfloHgyE0Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bob Peterson , Andreas Gruenbacher , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 4.19 137/172] gfs2: Allow lock_nolock mount to specify jid=X Date: Wed, 17 Jun 2020 21:21:43 -0400 Message-Id: <20200618012218.607130-137-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Peterson [ Upstream commit ea22eee4e6027d8927099de344f7fff43c507ef9 ] Before this patch, a simple typo accidentally added \n to the jid= string for lock_nolock mounts. This made it impossible to mount a gfs2 file system with a journal other than journal0. Thus: mount -tgfs2 -o hostdata="jid=1" Resulted in: mount: wrong fs type, bad option, bad superblock on In most cases this is not a problem. However, for debugging and testing purposes we sometimes want to test the integrity of other journals. This patch removes the unnecessary \n and thus allows lock_nolock users to specify an alternate journal. Signed-off-by: Bob Peterson Signed-off-by: Andreas Gruenbacher Signed-off-by: Sasha Levin --- fs/gfs2/ops_fstype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index b041cb8ae383..ed77b10bdfb5 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -903,7 +903,7 @@ static int init_per_node(struct gfs2_sbd *sdp, int undo) } static const match_table_t nolock_tokens = { - { Opt_jid, "jid=%d\n", }, + { Opt_jid, "jid=%d", }, { Opt_err, NULL }, }; -- 2.25.1