From patchwork Fri Jul 21 04:38:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9856083 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 C9CD260393 for ; Fri, 21 Jul 2017 04:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7F5F287A4 for ; Fri, 21 Jul 2017 04:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A990287B4; Fri, 21 Jul 2017 04:40:13 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 4023828773 for ; Fri, 21 Jul 2017 04:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751578AbdGUEkM (ORCPT ); Fri, 21 Jul 2017 00:40:12 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33176 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751464AbdGUEkL (ORCPT ); Fri, 21 Jul 2017 00:40:11 -0400 Received: by mail-pf0-f193.google.com with SMTP id k72so561226pfj.0; Thu, 20 Jul 2017 21:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O6OhoMMO5YOBLRADSm+EbqpZ4WXGdowgbkQC5jeye/U=; b=feAyEKRT3rvaXA85empdW0X526t3ArcBiyjdKjXF7rlsS5bmloY1O0vxsWBQBXUZdI fQ2y+uVytKposJq2p7gWAW6ON9Ae4ZO77f2QmY46wYlHWCKcxu4O+UStaUmbK58N6Joa ANeoHC4JFZBtX5C6pWk0ROo6JM1ZDL9rr2DpmWZeNXJA+rWqDZFVqoR9IaYUYwByKTQZ foDZ6XctE7DE/XN+jOB50LRJfrEvRKV3NGnnlg3nbkedfXmjU00RMe9YmORewECfiog8 V4vbV5hpQ9R5oq36pmz+3xhuBByZ5PuywjHiGY+zT4HG/DLdvyhmtJaLKcp4c7ud5JTT xCag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O6OhoMMO5YOBLRADSm+EbqpZ4WXGdowgbkQC5jeye/U=; b=X9XIeQGaMkmxLUz2Vx5oQETMQIvDtp/eO/AwQk3daKCPEGUgtEhvo9GJCbE5D5Y1sl zfqXXwz82xYAlEDkoivgorjD2mLRoEpEU9PL0hywjt7St7TjF+ttyzqTM7xn5QJzh5QQ JGxNgsvqrGEWlJ5DfR0QGVqUhwFOw/yrQgooFGfV3gjIKaJ3WLRRG3s+6G/TajOnsFQ+ nMEUcMwgaToDs3BqGbvOoBbn5onc5qIsUCOat/gBL1htlS90oP1QpAfqcZcduotq2Pnq 0uAWvLRa+imYLyQQhp6wWLHuLNcfpT2EiKdAs9IV5SW2QD6phHi9OdS1wDGqhPqOqHqE YUag== X-Gm-Message-State: AIVw110ycFfD+COrIDanXav3cN3/llyTc/lV7vV/5t8YFdWi8DSRtMni 5JENIWcTIKBjtQepW6o= X-Received: by 10.98.156.210 with SMTP id u79mr6248098pfk.71.1500612010627; Thu, 20 Jul 2017 21:40:10 -0700 (PDT) Received: from zzz.hsd1.wa.comcast.net (c-73-239-167-150.hsd1.wa.comcast.net. [73.239.167.150]) by smtp.gmail.com with ESMTPSA id c124sm7471334pfg.13.2017.07.20.21.40.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 21:40:10 -0700 (PDT) From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Eric Biggers Subject: [PATCH v2 03/15] tests: port xfs/095 to Linux Date: Thu, 20 Jul 2017 21:38:41 -0700 Message-Id: <20170721043853.364-4-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170721043853.364-1-ebiggers3@gmail.com> References: <20170721043853.364-1-ebiggers3@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers This tests upgrading the XFS log to v2. Switch from the IRIX xfs_chver program to xfs_db. Signed-off-by: Eric Biggers --- tests/xfs/095 | 11 +++++------ tests/xfs/095.out | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/xfs/095 b/tests/xfs/095 index d1373586..1f5a51f6 100755 --- a/tests/xfs/095 +++ b/tests/xfs/095 @@ -1,7 +1,7 @@ #! /bin/bash # FS QA Test No. 095 # -# test out xfs_chver on IRIX +# Test upgrading the XFS log to v2 # #----------------------------------------------------------------------- # Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. @@ -46,7 +46,7 @@ _cleanup() # Modify as appropriate. _supported_fs xfs -_supported_os IRIX +_supported_os Linux _require_scratch _require_v2log @@ -54,14 +54,13 @@ export MOUNT_OPTIONS="-o logbsize=64k" # try and mount a v1 log with a v2 LRsize # expect failure -_mkfs_log "-l version=1" +_mkfs_log "-l version=1 -m crc=0 -d sectsize=512" +_scratch_xfs_db -c 'version' | tr ',' '\n' | grep LOGV2 _create_log # now make the fs a v2 fs and try to mount again # it should succeed this time -xfs_chver -l 2 $SCRATCH_DEV | \ -sed -e "s#$SCRATCH_DEV#SCRATCH_DEV#g" \ - -e 's/[0-9][0-9]* AGs/N AGs/' +_scratch_xfs_db -x -c 'version log2' | tr ',' '\n' | grep LOGV2 _create_log # success, all done diff --git a/tests/xfs/095.out b/tests/xfs/095.out index 36ffdecc..378876d8 100644 --- a/tests/xfs/095.out +++ b/tests/xfs/095.out @@ -2,5 +2,4 @@ QA output created by 095 *** mount failed: -o logbsize=64k *** -xfs_chver: SCRATCH_DEV: changing version 0x3084 to 0x3484 in N AGs -xfs_chver: SCRATCH_DEV: changing feature2 0x0 to 0x0 in N AGs +LOGV2