From patchwork Wed Nov 9 23:00:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9420297 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 E5303601C2 for ; Wed, 9 Nov 2016 23:00:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D79C429309 for ; Wed, 9 Nov 2016 23:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC8B5293A6; Wed, 9 Nov 2016 23:00:53 +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=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 8200F29309 for ; Wed, 9 Nov 2016 23:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754419AbcKIXAw (ORCPT ); Wed, 9 Nov 2016 18:00:52 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:19416 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754049AbcKIXAv (ORCPT ); Wed, 9 Nov 2016 18:00:51 -0500 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uA9N0LB6022628 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 9 Nov 2016 23:00:21 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id uA9N0Kax009544 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 9 Nov 2016 23:00:20 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id uA9N0Jvo021135; Wed, 9 Nov 2016 23:00:19 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 09 Nov 2016 15:00:18 -0800 Date: Wed, 9 Nov 2016 15:00:17 -0800 From: "Darrick J. Wong" To: mfasheh@versity.com, jlbec@evilplan.org, eguan@redhat.com Cc: linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com, fstests Subject: [PATCH 7/6] xfstests: fix some minor problems testing ocfs2 Message-ID: <20161109230017.GB21519@birch.djwong.org> References: <147873186646.2820.17513529102740292215.stgit@birch.djwong.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <147873186646.2820.17513529102740292215.stgit@birch.djwong.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are a a few things about ocfs2 tools that need special-casing in xfstests, so fix them so that we can start testing ocfs2. Signed-off-by: Darrick J. Wong --- common/quota | 2 +- common/rc | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/quota b/common/quota index 678bc43..d9bb8d9 100644 --- a/common/quota +++ b/common/quota @@ -34,7 +34,7 @@ _require_quota() _notrun "Installed kernel does not support quotas" fi ;; - gfs2) + gfs2|ocfs2) ;; xfs) if [ ! -f /proc/fs/xfs/xqmstat ]; then diff --git a/common/rc b/common/rc index 8e078da..c75b614 100644 --- a/common/rc +++ b/common/rc @@ -978,7 +978,7 @@ _scratch_mkfs_sized() xfs) def_blksz=`echo $MKFS_OPTIONS|sed -rn 's/.*-b ?size= ?+([0-9]+).*/\1/p'` ;; - ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4) + ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4|ocfs2) def_blksz=`echo $MKFS_OPTIONS| sed -rn 's/.*-b ?+([0-9]+).*/\1/p'` ;; esac @@ -1015,6 +1015,9 @@ _scratch_mkfs_sized() ext2|ext3|ext4|ext4dev) ${MKFS_PROG}.$FSTYP -F $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks ;; + ocfs2) + yes | ${MKFS_PROG}.$FSTYP -F $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks + ;; udf) $MKFS_UDF_PROG $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks ;; @@ -1087,9 +1090,12 @@ _scratch_mkfs_blocksized() xfs) _scratch_mkfs_xfs $MKFS_OPTIONS -b size=$blocksize ;; - ext2|ext3|ext4|ocfs2) + ext2|ext3|ext4) ${MKFS_PROG}.$FSTYP -F $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV ;; + ocfs2) + yes | ${MKFS_PROG}.$FSTYP -F $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV + ;; *) _notrun "Filesystem $FSTYP not supported in _scratch_mkfs_blocksized" ;;