From patchwork Thu Jan 11 06:55:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10157353 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 86F42601A1 for ; Thu, 11 Jan 2018 06:56:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79B6C28685 for ; Thu, 11 Jan 2018 06:56:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D42D28687; Thu, 11 Jan 2018 06:56:15 +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 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 C598528685 for ; Thu, 11 Jan 2018 06:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932100AbeAKG4N (ORCPT ); Thu, 11 Jan 2018 01:56:13 -0500 Received: from prv3-mh.provo.novell.com ([137.65.250.26]:41288 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753978AbeAKG4K (ORCPT ); Thu, 11 Jan 2018 01:56:10 -0500 Received: from adam-pc.lan (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (NOT encrypted); Wed, 10 Jan 2018 23:56:07 -0700 From: Qu Wenruo To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 3/5] fstests: btrfs/141: Filter out offset to handle mkfs chunk layout change Date: Thu, 11 Jan 2018 14:55:59 +0800 Message-Id: <20180111065601.5831-3-wqu@suse.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111065601.5831-1-wqu@suse.com> References: <20180111065601.5831-1-wqu@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Due to recent mkfs.btrfs chunk layout change, offset in golden output is not flex enough to handle different mkfs chunk layout. So use _filter_xfs_io_offset to filter out offset so golden output can handle any chunk layout. Signed-off-by: Qu Wenruo --- tests/btrfs/141 | 9 ++++--- tests/btrfs/141.out | 70 ++++++++++++++++++++++++++--------------------------- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/tests/btrfs/141 b/tests/btrfs/141 index 709bb0af..643ce6df 100755 --- a/tests/btrfs/141 +++ b/tests/btrfs/141 @@ -78,7 +78,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 # chunk _scratch_mount -o nospace_cache -$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\ + _filter_xfs_io | _filter_xfs_io_offset # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first # one in $SCRATCH_DEV_POOL @@ -89,7 +90,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c physical_on_scratch=`get_physical ${logical_in_btrfs}` _scratch_unmount -$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\ + _filter_xfs_io | _filter_xfs_io_offset _scratch_mount @@ -110,7 +112,8 @@ done _scratch_unmount # check if the repair works -$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\ + _filter_xfs_io | _filter_xfs_io_offset _scratch_dev_pool_put # success, all done diff --git a/tests/btrfs/141.out b/tests/btrfs/141.out index 2e08fc22..116f98a2 100644 --- a/tests/btrfs/141.out +++ b/tests/btrfs/141.out @@ -1,39 +1,39 @@ QA output created by 141 -wrote 131072/131072 bytes at offset 0 +wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 65536/65536 bytes at offset 136708096 +wrote 65536/65536 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes at offset 136708096 +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +read 512/512 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)