From patchwork Tue Jun 23 19:56:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 223465 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.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 76253C433E0 for ; Tue, 23 Jun 2020 20:30:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B9BD206C3 for ; Tue, 23 Jun 2020 20:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944205; bh=hrPTK8YHJ0hOxobAYEHdd+ZGsXffsj1OXOAlxPPAFjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=03f1I2cFeTVtCMeBEyV5UWDrQmamL5C74wjltkJU/Txs0vuobh92tnDE3k5me7z5j ioR6xDSvYPoNx7MKl3ZzPSuirNhCxLGv9iX9zUukc3IBZy6avH8mC6SOpLARLxJqsn lVZRZ7RAjNctxqhCWw21TzzKNOU5pmTjCtkSpxV4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391031AbgFWUaD (ORCPT ); Tue, 23 Jun 2020 16:30:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:50148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390558AbgFWU37 (ORCPT ); Tue, 23 Jun 2020 16:29:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0E026206EB; Tue, 23 Jun 2020 20:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944199; bh=hrPTK8YHJ0hOxobAYEHdd+ZGsXffsj1OXOAlxPPAFjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFvuc71JKTMZXotPqONcPn4udqihTGiB3261LZ1VJJfHHLK2QzCbHG7jvfETwFiw/ JqVPs+wxtBN+gsDAiI5IPYAvJ/wrPALOTyaP3ff+NWGHVS0z+EWedl1loKkPVCpV8B g69UahsO6oAuAULjZmSxKF3VNddB+kMRDmZ5qNh8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bob Peterson , Andreas Gruenbacher , Sasha Levin Subject: [PATCH 5.4 212/314] gfs2: Allow lock_nolock mount to specify jid=X Date: Tue, 23 Jun 2020 21:56:47 +0200 Message-Id: <20200623195349.029151363@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195338.770401005@linuxfoundation.org> References: <20200623195338.770401005@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 18daf494abab9..c26c864590cc3 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -911,7 +911,7 @@ fail: } static const match_table_t nolock_tokens = { - { Opt_jid, "jid=%d\n", }, + { Opt_jid, "jid=%d", }, { Opt_err, NULL }, };