From patchwork Wed Jul 22 08:22:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 6840951 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD3B0C05AC for ; Wed, 22 Jul 2015 08:22:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 099FB206D4 for ; Wed, 22 Jul 2015 08:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED85E206E3 for ; Wed, 22 Jul 2015 08:22:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932771AbbGVIWb (ORCPT ); Wed, 22 Jul 2015 04:22:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57798 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbbGVIWa (ORCPT ); Wed, 22 Jul 2015 04:22:30 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id BD64C2F8101 for ; Wed, 22 Jul 2015 08:22:30 +0000 (UTC) Received: from localhost (dhcp-12-142.nay.redhat.com [10.66.12.142]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6M8MSP8017655; Wed, 22 Jul 2015 04:22:29 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH] xfs/078: omit -m crc=0 mkfs option if mkfs.xfs has no meta support Date: Wed, 22 Jul 2015 16:22:16 +0800 Message-Id: <1437553336-30408-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This basically does the same as in commit 90a3bfc xfs: be compatible with older mkfs.xfs which has no v5 support which left xfs/078 behind. Signed-off-by: Eryu Guan Reviewed-by: Eric Sandeen --- tests/xfs/078 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/xfs/078 b/tests/xfs/078 index 32436f7..0d6eb55 100755 --- a/tests/xfs/078 +++ b/tests/xfs/078 @@ -87,7 +87,11 @@ _grow_loop() echo echo "*** mkfs loop file (size=$original)" - $MKFS_XFS_PROG -m crc=0 -b size=$bsize -d $dparam \ + mkfs_crc_opts="-m crc=0" + if [ -n "$XFS_MKFS_HAS_NO_META_SUPPORT" ]; then + mkfs_crc_opts="" + fi + $MKFS_XFS_PROG $mkfs_crc_opts -b size=$bsize -d $dparam \ | _filter_mkfs 2>/dev/null echo "*** extend loop file"