From patchwork Wed Mar 11 11:15:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5983561 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 0F7BBBF440 for ; Wed, 11 Mar 2015 11:15:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CAFE203AC for ; Wed, 11 Mar 2015 11:15:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D1A9203A0 for ; Wed, 11 Mar 2015 11:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751646AbbCKLPw (ORCPT ); Wed, 11 Mar 2015 07:15:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33168 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751593AbbCKLPv (ORCPT ); Wed, 11 Mar 2015 07:15:51 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2BBFoIK024380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 11 Mar 2015 07:15:51 -0400 Received: from localhost (dhcp12-136.nay.redhat.com [10.66.12.136] (may be forged)) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2BBFmMa021792; Wed, 11 Mar 2015 07:15:49 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH 3/4] common: append -d option to XFS_COPY_PROG when testing v5 xfs Date: Wed, 11 Mar 2015 19:15:33 +0800 Message-Id: <1426072534-12246-4-git-send-email-eguan@redhat.com> In-Reply-To: <1426072534-12246-1-git-send-email-eguan@redhat.com> References: <1426072534-12246-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 xfs_copy doesn't work on v5 xfs without -d option, this fails xfs/073 when testing xfs with MKFS_OPTIONS="-m crc=1" set. Signed-off-by: Eryu Guan Reviewed-by: Eric Sandeen --- common/rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/rc b/common/rc index 1ed9df5..ad87a18 100644 --- a/common/rc +++ b/common/rc @@ -2926,6 +2926,11 @@ init_rc() # Figure out if we need to add -F ("foreign", deprecated) option to xfs_io xfs_io -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" && \ export XFS_IO_PROG="$XFS_IO_PROG -F" + + # xfs_copy doesn't work on v5 xfs yet without -d option + if [ "$FSTYP" == "xfs" ] && [[ $MKFS_OPTIONS =~ crc=1 ]]; then + export XFS_COPY_PROG="$XFS_COPY_PROG -d" + fi } # get real device path name by following link