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=unavailable 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 49EA9C433DF for ; Thu, 18 Jun 2020 02:13:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 272FD20853 for ; Thu, 18 Jun 2020 02:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592446398; bh=cFKRK0P75KlGm5ylZxFgc3LvzLFkmNDFhzOnV5ssDNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mmsGMfWkiFw+1kxyBslehpEm5uv8vHFIglncTp1wfSu6ug+qZgrIxP7vj5/jjXc2i CZKmgdplNVedlWhn3SHYPixZzR0EdXZZAShJIvWLnm2YgYGkE065h42T4ha+ezzK0n eA71FF2P2/HAkLcjHJ+7e3uJr23pGxHCzLMJXGa0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729779AbgFRCMz (ORCPT ); Wed, 17 Jun 2020 22:12:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:53506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730456AbgFRBVN (ORCPT ); Wed, 17 Jun 2020 21:21: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 4A54721D90; Thu, 18 Jun 2020 01:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443273; bh=cFKRK0P75KlGm5ylZxFgc3LvzLFkmNDFhzOnV5ssDNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JSQAvn+was5fzwUv1g9pfMzwgtnNPig1aPM/eaK2nGArPvxUpu8pDVjj0UR4fpoZK byFgJJt7FNGMevuw3iN6ikUcnjs6A8+B2Hd0fSJmWqBPTAmhKpku3RutfGG5Am+CbN JbhrsKZtjRnUbEuPJmup3yV8FA81aAE2GPDJVMOE= 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 5.4 218/266] gfs2: Allow lock_nolock mount to specify jid=X Date: Wed, 17 Jun 2020 21:15:43 -0400 Message-Id: <20200618011631.604574-218-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618011631.604574-1-sashal@kernel.org> References: <20200618011631.604574-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 18daf494abab..c26c864590cc 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -911,7 +911,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