From patchwork Mon May 14 17:03:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10398941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ACB9B6055B for ; Mon, 14 May 2018 17:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E02C27C0B for ; Mon, 14 May 2018 17:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92BBA28390; Mon, 14 May 2018 17:04:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89CBC27C0B for ; Mon, 14 May 2018 17:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755287AbeENRD7 (ORCPT ); Mon, 14 May 2018 13:03:59 -0400 Received: from mx2.suse.de ([195.135.220.15]:43691 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752393AbeENRD6 (ORCPT ); Mon, 14 May 2018 13:03:58 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7E504AE16 for ; Mon, 14 May 2018 17:03:57 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 629611E0CD6; Mon, 14 May 2018 19:03:57 +0200 (CEST) From: Jan Kara To: Cc: Jan Kara Subject: [PATCH 3/3] common/quota: Fix _qmount_options for ext4 journalled quotas Date: Mon, 14 May 2018 19:03:51 +0200 Message-Id: <20180514170351.13737-4-jack@suse.cz> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180514170351.13737-1-jack@suse.cz> References: <20180514170351.13737-1-jack@suse.cz> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP _qmount_options didn't properly replace ext[34] journalled quotas mount options. As such the mount option string got garbled and the test (e.g. generic/379) failed. Signed-off-by: Jan Kara --- common/quota | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/quota b/common/quota index 2b99521df43d..f01bd068383b 100644 --- a/common/quota +++ b/common/quota @@ -229,8 +229,10 @@ _qmount_option() export MOUNT_OPTIONS=`echo $MOUNT_OPTIONS \ | sed -e 's/uquota/QUOTA/g' \ -e 's/usrquota/QUOTA/g' \ + -e 's/usrjquota=[^, ]/QUOTA/g' \ -e 's/gquota/QUOTA/g' \ -e 's/grpquota/QUOTA/g' \ + -e 's/grpjquota=[^, ]/QUOTA/g' \ -e 's/\bpquota/QUOTA/g' \ -e 's/prjquota/QUOTA/g' \ -e 's/quota/QUOTA/g' \