From patchwork Fri Oct 7 13:53:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13001151 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6D40C433FE for ; Fri, 7 Oct 2022 13:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229799AbiJGNyA (ORCPT ); Fri, 7 Oct 2022 09:54:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbiJGNx7 (ORCPT ); Fri, 7 Oct 2022 09:53:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 577EBC822B; Fri, 7 Oct 2022 06:53:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E708561D03; Fri, 7 Oct 2022 13:53:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6896EC433C1; Fri, 7 Oct 2022 13:53:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665150837; bh=Mv20x5R0GyA7aMQqejLyJfPGmhqW9LoIq1Vd0Doq0zY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RF5WC5XTXmB99q4wSgtiY6ySQirwl8FqjPr/PS7L7R6v84LuaB8lg+0mPfs06EwqV IY5nwkraTlU0J5ghHpYqwjn14ilUXShPPtSuLBLmPTsayQohCBaRX4WmEetvOc8FF/ 36E5cDbZIfbQOfK4In42EwgJEFyl+Dw9XXA4BjSOJ1g4AZkY59bnFKIYPjqVvPKbDL CW1Z/+MbTqeYKAmQrdMnCtZV/Ej82X7bEXrz1FYHi94GVAl94ZfwLq9/fqsHd0ApAF lF/1tMnCiFpspAYe9eXYKT3cD/TYdECNtcio8E3MJGwaOlHoRwHAfbLBwvOtDRNtDC kB3QQESCp9gBQ== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com, Filipe Manana Subject: [PATCH 1/3] btrfs: test fiemap on large file with extents shared through a snapshot Date: Fri, 7 Oct 2022 14:53:34 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Filipe Manana Verify that fiemap correctly reports the sharedness of extents for a file with a very large number of extents, spanning many b+tree leaves in the fs tree, and when the file's subvolume was snapshoted. Currently this passes on all kernel releases and its purpose is to prevent and detect regressions in the future, as this actually happened during recent development on the btrfs' fiemap related code. With this test we now have better coverage for fiemap when a file is shared through a snapshot. Signed-off-by: Filipe Manana Reviewed-by: Zorro Lang --- tests/btrfs/276 | 124 ++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/276.out | 16 ++++++ 2 files changed, 140 insertions(+) create mode 100755 tests/btrfs/276 create mode 100644 tests/btrfs/276.out diff --git a/tests/btrfs/276 b/tests/btrfs/276 new file mode 100755 index 00000000..c27e8383 --- /dev/null +++ b/tests/btrfs/276 @@ -0,0 +1,124 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2022 SUSE Linux Products GmbH. All Rights Reserved. +# +# FS QA Test 276 +# +# Verify that fiemap correctly reports the sharedness of extents for a file with +# a very large number of extents, spanning many b+tree leaves in the fs tree, +# and when the file's subvolume was snapshoted. +# +. ./common/preamble +_begin_fstest auto snapshot compress + +. ./common/filter + +_supported_fs btrfs +_require_scratch +_require_xfs_io_command "fiemap" "ranged" + +_scratch_mkfs >> $seqres.full 2>&1 +# We use compression because it's a very quick way to create a file with a very +# large number of extents (compression limits the maximum extent size to 128K) +# and while using very little disk space. +_scratch_mount -o compress + +fiemap_test_file() +{ + local offset=$1 + local len=$2 + + # Skip the first two lines of xfs_io's fiemap output (file path and + # header describing the output columns). + $XFS_IO_PROG -c "fiemap -v $offset $len" $SCRATCH_MNT/foo | tail -n +3 +} + +# Count the number of shared extents for the whole test file or just for a given +# range. +count_shared_extents() +{ + local offset=$1 + local len=$2 + + # Column 5 (from xfs_io's "fiemap -v" command) is the flags (hex field). + # 0x2000 is the value for the FIEMAP_EXTENT_SHARED flag. + fiemap_test_file $offset $len | \ + $AWK_PROG --source 'BEGIN { cnt = 0 }' \ + --source '{ if (and(strtonum($5), 0x2000)) cnt++ }' \ + --source 'END { print cnt }' +} + +# Count the number of non shared extents for the whole test file or just for a +# given range. +count_not_shared_extents() +{ + local offset=$1 + local len=$2 + + # Column 5 (from xfs_io's "fiemap -v" command) is the flags (hex field). + # 0x2000 is the value for the FIEMAP_EXTENT_SHARED flag. + fiemap_test_file $offset $len | \ + $AWK_PROG --source 'BEGIN { cnt = 0 }' \ + --source '{ if (!and(strtonum($5), 0x2000)) cnt++ }' \ + --source 'END { print cnt }' +} + +# Create a 16G file as that results in 131072 extents, all with a size of 128K +# (due to compression), and a fs tree with a height of 3 (root node at level 2). +# We want to verify later that fiemap correctly reports the sharedness of each +# extent, even when it needs to switch from one leaf to the next one and from a +# node at level 1 to the next node at level 1. +# +$XFS_IO_PROG -f -c "pwrite -b 8M 0 16G" $SCRATCH_MNT/foo | _filter_xfs_io + +# Sync to flush delalloc and commit the current transaction, so fiemap will see +# all extents in the fs tree and extent trees and not look at delalloc. +sync + +# All extents should be reported as non shared (131072 extents). +echo "Number of non-shared extents in the whole file: $(count_not_shared_extents)" + +# Creating a snapshot. +$BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT $SCRATCH_MNT/snap | _filter_scratch + +# We have a snapshot, so now all extents should be reported as shared. +echo "Number of shared extents in the whole file: $(count_shared_extents)" + +# Now COW two file ranges, of 1M each, in the snapshot's file. +# So 16 extents should become non-shared after this. +# +$XFS_IO_PROG -c "pwrite -b 1M 8M 1M" \ + -c "pwrite -b 1M 12G 1M" \ + $SCRATCH_MNT/snap/foo | _filter_xfs_io + +# Sync to flush delalloc and commit the current transaction, so fiemap will see +# all extents in the fs tree and extent trees and not look at delalloc. +sync + +# Now we should have 16 non-shared extents and 131056 (131072 - 16) shared +# extents. +echo "Number of non-shared extents in the whole file: $(count_not_shared_extents)" +echo "Number of shared extents in the whole file: $(count_shared_extents)" + +# Check that the non-shared extents are indeed in the expected file ranges (each +# with 8 extents). +echo "Number of non-shared extents in range [8M, 9M): $(count_not_shared_extents 8M 1M)" +echo "Number of non-shared extents in range [12G, 12G + 1M): $(count_not_shared_extents 12G 1M)" + +# Now delete the snapshot. +$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap | _filter_scratch + +# We deleted the snapshot and committed the transaction used to delete it (-c), +# but all its extents (both metadata and data) are actually only deleted in the +# background, by the cleaner kthread. So remount, which wakes up the cleaner +# kthread, with a commit interval of 1 second and sleep for 1.1 seconds - after +# this we are guaranteed all extents of the snapshot were deleted. +_scratch_remount commit=1 +sleep 1.1 + +# Now all extents should be reported as not shared (131072 extents). +echo "Number of non-shared extents in the whole file: $(count_not_shared_extents)" + +# success, all done +status=0 +exit diff --git a/tests/btrfs/276.out b/tests/btrfs/276.out new file mode 100644 index 00000000..3bf5a5e6 --- /dev/null +++ b/tests/btrfs/276.out @@ -0,0 +1,16 @@ +QA output created by 276 +wrote 17179869184/17179869184 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Number of non-shared extents in the whole file: 131072 +Create a snapshot of 'SCRATCH_MNT' in 'SCRATCH_MNT/snap' +Number of shared extents in the whole file: 131072 +wrote 1048576/1048576 bytes at offset 8388608 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 1048576/1048576 bytes at offset 12884901888 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Number of non-shared extents in the whole file: 16 +Number of shared extents in the whole file: 131056 +Number of non-shared extents in range [8M, 9M): 8 +Number of non-shared extents in range [12G, 12G + 1M): 8 +Delete subvolume (commit): 'SCRATCH_MNT/snap' +Number of non-shared extents in the whole file: 131072 From patchwork Fri Oct 7 13:53:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13001152 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54F4AC4332F for ; Fri, 7 Oct 2022 13:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230011AbiJGNyE (ORCPT ); Fri, 7 Oct 2022 09:54:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbiJGNyD (ORCPT ); Fri, 7 Oct 2022 09:54:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBE8A114DD2; Fri, 7 Oct 2022 06:54:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 66D0DB82366; Fri, 7 Oct 2022 13:54:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DEE2C433D6; Fri, 7 Oct 2022 13:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665150840; bh=scGEi70A05frxQWFYf+ZBs3SYujSvbWGdBtg8Xs6Dhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yj7a8UeIwgqEr4DvJQVlzPyXclu7uxYhCgfv9VKYZdD4v7fRSWiHA9+csiZSPXRor C0/iXnBRSALXXlXresvKArnqYazEzut6nBYQADih3Q516+/JCGe4OXAVai3wpo8xdl KawW+5W0YeQgtv0YiX3WMCc1DNSM8dgz6gNzErUZHik/OzBcsi7paUWP2KGEJAOb5g rxMevvR4oCbQuqn0N1SJ2S0Bw/XG3i16iNvr6QpzzHmQwPXhlv84+lUzBeDUzRvnax dzZ4m2kI0A4bhko2GFG6z68k/vf1RyRTY7eFEqzvqLX/tYbElURmoJzDc8/VYjIOuW 2VM2zm1dJt1Fw== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com, Filipe Manana Subject: [PATCH 2/3] fstests: add missing require of xfs_io fiemap command to some tests Date: Fri, 7 Oct 2022 14:53:35 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Filipe Manana btrfs/257, btrfs/258, btrfs/259 and xfs/443 use the fiemap command of xfs_io but don't do a '_require_xfs_io_command "fiemap"'. So add the missing requirement. Signed-off-by: Filipe Manana Reviewed-by: Zorro Lang Reviewed-by: Darrick J. Wong --- tests/btrfs/257 | 1 + tests/btrfs/258 | 1 + tests/btrfs/259 | 1 + tests/xfs/443 | 1 + 4 files changed, 4 insertions(+) diff --git a/tests/btrfs/257 b/tests/btrfs/257 index 3092495f..87f9e0b2 100755 --- a/tests/btrfs/257 +++ b/tests/btrfs/257 @@ -33,6 +33,7 @@ _require_btrfs_no_compress # Needs 4K sectorsize _require_btrfs_support_sectorsize 4096 _require_xfs_io_command "falloc" +_require_xfs_io_command "fiemap" _scratch_mkfs -s 4k >> $seqres.full 2>&1 diff --git a/tests/btrfs/258 b/tests/btrfs/258 index da073333..be61d039 100755 --- a/tests/btrfs/258 +++ b/tests/btrfs/258 @@ -17,6 +17,7 @@ _begin_fstest auto defrag quick # Modify as appropriate. _supported_fs generic _require_scratch +_require_xfs_io_command "fiemap" # Needs 4K sectorsize, as larger sectorsize can change the file layout. _require_btrfs_support_sectorsize 4096 diff --git a/tests/btrfs/259 b/tests/btrfs/259 index 92d0b9a6..36f499f9 100755 --- a/tests/btrfs/259 +++ b/tests/btrfs/259 @@ -18,6 +18,7 @@ _begin_fstest auto quick defrag # Modify as appropriate. _supported_fs btrfs _require_scratch +_require_xfs_io_command "fiemap" _scratch_mkfs >> $seqres.full diff --git a/tests/xfs/443 b/tests/xfs/443 index f2390bf3..de28b85b 100755 --- a/tests/xfs/443 +++ b/tests/xfs/443 @@ -30,6 +30,7 @@ _require_test_program "punch-alternating" _require_xfs_io_command "falloc" _require_xfs_io_command "fpunch" _require_xfs_io_command "swapext" +_require_xfs_io_command "fiemap" _scratch_mkfs | _filter_mkfs >> $seqres.full 2> $tmp.mkfs _scratch_mount From patchwork Fri Oct 7 13:53:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 13001153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 560C1C433F5 for ; Fri, 7 Oct 2022 13:54:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229531AbiJGNyO (ORCPT ); Fri, 7 Oct 2022 09:54:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229508AbiJGNyN (ORCPT ); Fri, 7 Oct 2022 09:54:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D017114DFE; Fri, 7 Oct 2022 06:54:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 18D4CB82367; Fri, 7 Oct 2022 13:54:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A737DC433C1; Fri, 7 Oct 2022 13:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665150847; bh=pmiF01/v7UELOMOs3H99YLy7dTF7UuDnJtqr9zq6qD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D6btFM2I4RpkNEaNvMQS0t4ftvUkuoWjsb1APNU0YcI7bnWr7cGtYuA9sDy/vKFin AwnfKR09rxYNAyrA/0IHaa7Z6xDzSysoksS/CdvVvVV+9FuqtE3rTQ44gQkONNlenr nk2jfcQPYBdu7ggQFzNEPccvkA3bcyXS5jcQ05O4fCQZx5uGPBbGKO+hsXofCJwI/b m+F3Co+BX2FxgqhnditCun5EpRHzL7l1e6iXUHaCcMIE8k6uf8cvMFunX+GRhXwgW9 J0D81O4gxGOnJGbVL8MeStjDl4c7tc1zM7aqEEcIADbA+O09xpJZb7b5Th4eonP5hr 1lRGfZ2rja3zQ== From: fdmanana@kernel.org To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, zlang@redhat.com, Filipe Manana Subject: [PATCH 3/3] fstests: add fiemap group Date: Fri, 7 Oct 2022 14:53:36 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Filipe Manana Add a fiemap group for all tests that exercise fiemap, either directly through xfs_io, or more indirectly like through filefrag or helpers in common/* (like _count_extents, _count_holes, etc). This is useful in order to quickly test changes made to the fiemap implementation of a filesystem for example. Signed-off-by: Filipe Manana Reviewed-by: Zorro Lang Reviewed-by: Darrick J. Wong --- doc/group-names.txt | 1 + tests/btrfs/004 | 2 +- tests/btrfs/079 | 2 +- tests/btrfs/137 | 2 +- tests/btrfs/140 | 2 +- tests/btrfs/199 | 2 +- tests/btrfs/200 | 2 +- tests/btrfs/211 | 2 +- tests/btrfs/257 | 2 +- tests/btrfs/258 | 2 +- tests/btrfs/259 | 2 +- tests/btrfs/260 | 2 +- tests/btrfs/263 | 2 +- tests/btrfs/276 | 2 +- tests/ext4/001 | 2 +- tests/ext4/034 | 2 +- tests/ext4/308 | 2 +- tests/f2fs/002 | 2 +- tests/generic/009 | 2 +- tests/generic/012 | 2 +- tests/generic/016 | 2 +- tests/generic/017 | 2 +- tests/generic/021 | 2 +- tests/generic/022 | 2 +- tests/generic/032 | 2 +- tests/generic/043 | 2 +- tests/generic/044 | 2 +- tests/generic/045 | 2 +- tests/generic/046 | 2 +- tests/generic/047 | 2 +- tests/generic/048 | 2 +- tests/generic/049 | 2 +- tests/generic/058 | 2 +- tests/generic/060 | 2 +- tests/generic/061 | 2 +- tests/generic/063 | 2 +- tests/generic/064 | 2 +- tests/generic/092 | 2 +- tests/generic/094 | 2 +- tests/generic/110 | 2 +- tests/generic/111 | 2 +- tests/generic/115 | 2 +- tests/generic/177 | 2 +- tests/generic/225 | 2 +- tests/generic/255 | 2 +- tests/generic/301 | 2 +- tests/generic/302 | 2 +- tests/generic/305 | 2 +- tests/generic/316 | 2 +- tests/generic/326 | 2 +- tests/generic/327 | 2 +- tests/generic/328 | 2 +- tests/generic/352 | 2 +- tests/generic/353 | 2 +- tests/generic/372 | 2 +- tests/generic/414 | 2 +- tests/generic/425 | 2 +- tests/generic/473 | 2 +- tests/generic/483 | 2 +- tests/generic/516 | 2 +- tests/generic/519 | 2 +- tests/generic/540 | 2 +- tests/generic/541 | 2 +- tests/generic/542 | 2 +- tests/generic/543 | 2 +- tests/generic/578 | 2 +- tests/generic/654 | 2 +- tests/generic/655 | 2 +- tests/generic/677 | 2 +- tests/generic/679 | 2 +- tests/generic/695 | 2 +- tests/overlay/066 | 2 +- tests/shared/298 | 2 +- tests/xfs/180 | 2 +- tests/xfs/182 | 2 +- tests/xfs/184 | 2 +- tests/xfs/192 | 2 +- tests/xfs/193 | 2 +- tests/xfs/198 | 2 +- tests/xfs/200 | 2 +- tests/xfs/204 | 2 +- tests/xfs/207 | 2 +- tests/xfs/208 | 2 +- tests/xfs/209 | 2 +- tests/xfs/210 | 2 +- tests/xfs/211 | 2 +- tests/xfs/212 | 2 +- tests/xfs/213 | 2 +- tests/xfs/214 | 2 +- tests/xfs/231 | 2 +- tests/xfs/232 | 2 +- tests/xfs/252 | 2 +- tests/xfs/344 | 2 +- tests/xfs/345 | 2 +- tests/xfs/346 | 2 +- tests/xfs/347 | 2 +- tests/xfs/443 | 2 +- 97 files changed, 97 insertions(+), 96 deletions(-) diff --git a/doc/group-names.txt b/doc/group-names.txt index ef411b5e..6cc9af78 100644 --- a/doc/group-names.txt +++ b/doc/group-names.txt @@ -47,6 +47,7 @@ eio IO error reporting encrypt encrypted file contents enospc ENOSPC error reporting exportfs file handles +fiemap fiemap ioctl filestreams XFS filestreams allocator freeze filesystem freeze tests fsck general fsck tests diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 4e767a2f..aa37c45d 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -10,7 +10,7 @@ # We check to end up back at the original file with the correct offset. # . ./common/preamble -_begin_fstest auto rw metadata +_begin_fstest auto rw metadata fiemap noise_pid=0 diff --git a/tests/btrfs/079 b/tests/btrfs/079 index 1acd1855..92d59479 100755 --- a/tests/btrfs/079 +++ b/tests/btrfs/079 @@ -18,7 +18,7 @@ # btrfs: Fix the wrong condition judgment about subset extent map # . ./common/preamble -_begin_fstest auto rw metadata +_begin_fstest auto rw metadata fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/btrfs/137 b/tests/btrfs/137 index 64ed2450..7d03c260 100755 --- a/tests/btrfs/137 +++ b/tests/btrfs/137 @@ -7,7 +7,7 @@ # Test that both incremental and full send operations preserve file holes. # . ./common/preamble -_begin_fstest auto quick send +_begin_fstest auto quick send fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/btrfs/140 b/tests/btrfs/140 index fdff6eb2..247a7356 100755 --- a/tests/btrfs/140 +++ b/tests/btrfs/140 @@ -12,7 +12,7 @@ # commit 2e949b0a5592 ("Btrfs: fix invalid dereference in btrfs_retry_endio") # . ./common/preamble -_begin_fstest auto quick read_repair +_begin_fstest auto quick read_repair fiemap # Import common functions. . ./common/filter diff --git a/tests/btrfs/199 b/tests/btrfs/199 index 2024447c..709ad1f9 100755 --- a/tests/btrfs/199 +++ b/tests/btrfs/199 @@ -16,7 +16,7 @@ # boundary" # . ./common/preamble -_begin_fstest auto quick trim +_begin_fstest auto quick trim fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/btrfs/200 b/tests/btrfs/200 index 48cd7046..5ce3775f 100755 --- a/tests/btrfs/200 +++ b/tests/btrfs/200 @@ -8,7 +8,7 @@ # operations for extents that are shared between the same file. # . ./common/preamble -_begin_fstest auto quick send clone +_begin_fstest auto quick send clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/btrfs/211 b/tests/btrfs/211 index 60ef3d1b..f5744b75 100755 --- a/tests/btrfs/211 +++ b/tests/btrfs/211 @@ -10,7 +10,7 @@ # the NO_HOLES feature. # . ./common/preamble -_begin_fstest auto quick log prealloc +_begin_fstest auto quick log prealloc fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/btrfs/257 b/tests/btrfs/257 index 87f9e0b2..f8e69f7a 100755 --- a/tests/btrfs/257 +++ b/tests/btrfs/257 @@ -9,7 +9,7 @@ # . ./common/preamble -_begin_fstest auto quick defrag prealloc +_begin_fstest auto quick defrag prealloc fiemap # Override the default cleanup function. # _cleanup() diff --git a/tests/btrfs/258 b/tests/btrfs/258 index be61d039..e4a23dcc 100755 --- a/tests/btrfs/258 +++ b/tests/btrfs/258 @@ -8,7 +8,7 @@ # in the middle # . ./common/preamble -_begin_fstest auto defrag quick +_begin_fstest auto defrag quick fiemap . ./common/filter diff --git a/tests/btrfs/259 b/tests/btrfs/259 index 36f499f9..cbbea9f5 100755 --- a/tests/btrfs/259 +++ b/tests/btrfs/259 @@ -8,7 +8,7 @@ # at their max capacity. # . ./common/preamble -_begin_fstest auto quick defrag +_begin_fstest auto quick defrag fiemap # Import common functions. . ./common/filter diff --git a/tests/btrfs/260 b/tests/btrfs/260 index 8042ec4d..111a3bd6 100755 --- a/tests/btrfs/260 +++ b/tests/btrfs/260 @@ -8,7 +8,7 @@ # algorithm of all regular extents. # . ./common/preamble -_begin_fstest auto quick defrag compress prealloc +_begin_fstest auto quick defrag compress prealloc fiemap # Override the default cleanup function. # _cleanup() diff --git a/tests/btrfs/263 b/tests/btrfs/263 index d201f14e..8ff363d1 100755 --- a/tests/btrfs/263 +++ b/tests/btrfs/263 @@ -8,7 +8,7 @@ # defragmentation. # . ./common/preamble -_begin_fstest auto quick defrag +_begin_fstest auto quick defrag fiemap # Import common functions. . ./common/filter diff --git a/tests/btrfs/276 b/tests/btrfs/276 index c27e8383..944b0c8f 100755 --- a/tests/btrfs/276 +++ b/tests/btrfs/276 @@ -9,7 +9,7 @@ # and when the file's subvolume was snapshoted. # . ./common/preamble -_begin_fstest auto snapshot compress +_begin_fstest auto snapshot compress fiemap . ./common/filter diff --git a/tests/ext4/001 b/tests/ext4/001 index f1d1e829..f8650365 100755 --- a/tests/ext4/001 +++ b/tests/ext4/001 @@ -8,7 +8,7 @@ # seqfull=$0 . ./common/preamble -_begin_fstest auto prealloc quick zero +_begin_fstest auto prealloc quick zero fiemap # Import common functions. . ./common/filter diff --git a/tests/ext4/034 b/tests/ext4/034 index 223c964f..bf7466d4 100755 --- a/tests/ext4/034 +++ b/tests/ext4/034 @@ -11,7 +11,7 @@ # "ext4: make sure enough credits are reserved for dioread_nolock writes" # . ./common/preamble -_begin_fstest auto quick quota +_begin_fstest auto quick quota fiemap # Import common functions. . ./common/filter diff --git a/tests/ext4/308 b/tests/ext4/308 index b88ea056..849ebdf8 100755 --- a/tests/ext4/308 +++ b/tests/ext4/308 @@ -9,7 +9,7 @@ # So if ioctl was performed twice then inode's layout should not change. # . ./common/preamble -_begin_fstest auto ioctl rw prealloc quick defrag +_begin_fstest auto ioctl rw prealloc quick defrag fiemap PIDS="" diff --git a/tests/f2fs/002 b/tests/f2fs/002 index 59ca2a2d..8235d88a 100755 --- a/tests/f2fs/002 +++ b/tests/f2fs/002 @@ -40,7 +40,7 @@ # just test LZ4. . ./common/preamble -_begin_fstest auto quick rw encrypt compress +_begin_fstest auto quick rw encrypt compress fiemap . ./common/filter . ./common/f2fs diff --git a/tests/generic/009 b/tests/generic/009 index 3b362943..7c9b137f 100755 --- a/tests/generic/009 +++ b/tests/generic/009 @@ -7,7 +7,7 @@ # Test fallocate FALLOC_FL_ZERO_RANGE # . ./common/preamble -_begin_fstest auto quick prealloc zero +_begin_fstest auto quick prealloc zero fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/012 b/tests/generic/012 index 4b3c69f4..74e7a02b 100755 --- a/tests/generic/012 +++ b/tests/generic/012 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch collapse +_begin_fstest auto quick prealloc punch collapse fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/016 b/tests/generic/016 index 59cb8085..833e9161 100755 --- a/tests/generic/016 +++ b/tests/generic/016 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch collapse +_begin_fstest auto quick prealloc punch collapse fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/017 b/tests/generic/017 index 12c486d1..5f0d8513 100755 --- a/tests/generic/017 +++ b/tests/generic/017 @@ -10,7 +10,7 @@ # Also check for file system consistency after completing this operation # for each blocksize. . ./common/preamble -_begin_fstest auto prealloc collapse +_begin_fstest auto prealloc collapse fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/021 b/tests/generic/021 index 7407bf03..532feeeb 100755 --- a/tests/generic/021 +++ b/tests/generic/021 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch collapse +_begin_fstest auto quick prealloc punch collapse fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/022 b/tests/generic/022 index b983c5d0..62577b81 100755 --- a/tests/generic/022 +++ b/tests/generic/022 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch collapse +_begin_fstest auto quick prealloc punch collapse fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/032 b/tests/generic/032 index 3302c1ee..90ff0773 100755 --- a/tests/generic/032 +++ b/tests/generic/032 @@ -11,7 +11,7 @@ # are always read back as zeroes. # . ./common/preamble -_begin_fstest auto quick rw +_begin_fstest auto quick rw fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/043 b/tests/generic/043 index b1432e25..d5ca438a 100755 --- a/tests/generic/043 +++ b/tests/generic/043 @@ -7,7 +7,7 @@ # Test for NULL files problem # . ./common/preamble -_begin_fstest shutdown metadata log auto +_begin_fstest shutdown metadata log auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/044 b/tests/generic/044 index 56c50548..a5d3e9ed 100755 --- a/tests/generic/044 +++ b/tests/generic/044 @@ -7,7 +7,7 @@ # Test for NULL files problem # . ./common/preamble -_begin_fstest shutdown metadata log auto +_begin_fstest shutdown metadata log auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/045 b/tests/generic/045 index f5f36a7a..dfbcaeb4 100755 --- a/tests/generic/045 +++ b/tests/generic/045 @@ -7,7 +7,7 @@ # Test for NULL files problem # . ./common/preamble -_begin_fstest shutdown metadata log auto +_begin_fstest shutdown metadata log auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/046 b/tests/generic/046 index 5dbb8fa5..29165e45 100755 --- a/tests/generic/046 +++ b/tests/generic/046 @@ -7,7 +7,7 @@ # Test for NULL files problem # . ./common/preamble -_begin_fstest shutdown metadata log auto +_begin_fstest shutdown metadata log auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/047 b/tests/generic/047 index 770e7f1b..61590e9b 100755 --- a/tests/generic/047 +++ b/tests/generic/047 @@ -8,7 +8,7 @@ # test inode size is on disk after fsync # . ./common/preamble -_begin_fstest shutdown metadata rw auto +_begin_fstest shutdown metadata rw auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/048 b/tests/generic/048 index 10c87f3b..ebe9132e 100755 --- a/tests/generic/048 +++ b/tests/generic/048 @@ -8,7 +8,7 @@ # test inode size is on disk after sync # . ./common/preamble -_begin_fstest shutdown metadata rw auto +_begin_fstest shutdown metadata rw auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/049 b/tests/generic/049 index 4effc4a6..e5c5a0e3 100755 --- a/tests/generic/049 +++ b/tests/generic/049 @@ -8,7 +8,7 @@ # test inode size is on disk after sync - expose log replay bug # . ./common/preamble -_begin_fstest shutdown metadata rw auto +_begin_fstest shutdown metadata rw auto fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/058 b/tests/generic/058 index cb685ffb..dddadbe0 100755 --- a/tests/generic/058 +++ b/tests/generic/058 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch insert +_begin_fstest auto quick prealloc punch insert fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/060 b/tests/generic/060 index 0fd42785..3a890ed0 100755 --- a/tests/generic/060 +++ b/tests/generic/060 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch insert +_begin_fstest auto quick prealloc punch insert fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/061 b/tests/generic/061 index c4998b93..e370ffdf 100755 --- a/tests/generic/061 +++ b/tests/generic/061 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch insert +_begin_fstest auto quick prealloc punch insert fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/063 b/tests/generic/063 index 60a5f242..3974647b 100755 --- a/tests/generic/063 +++ b/tests/generic/063 @@ -11,7 +11,7 @@ # For the type of tests, check the description of _test_generic_punch # in common/rc. . ./common/preamble -_begin_fstest auto quick prealloc punch insert +_begin_fstest auto quick prealloc punch insert fiemap # Import common functions. # we need to include common/punch to get defination fo filter functions diff --git a/tests/generic/064 b/tests/generic/064 index 3b32fa1b..b50c55e7 100755 --- a/tests/generic/064 +++ b/tests/generic/064 @@ -10,7 +10,7 @@ # on the previously inserted ranges to test merge code of collapse # range. Also check for data integrity and file system consistency. . ./common/preamble -_begin_fstest auto quick prealloc collapse insert +_begin_fstest auto quick prealloc collapse insert fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/092 b/tests/generic/092 index 505e0ec8..8fefcb85 100755 --- a/tests/generic/092 +++ b/tests/generic/092 @@ -12,7 +12,7 @@ # preallocated space. # . ./common/preamble -_begin_fstest auto quick prealloc +_begin_fstest auto quick prealloc fiemap status=0 # success is the default! diff --git a/tests/generic/094 b/tests/generic/094 index 7a078a88..5c12b731 100755 --- a/tests/generic/094 +++ b/tests/generic/094 @@ -7,7 +7,7 @@ # Run the fiemap (file extent mapping) tester with preallocation enabled # . ./common/preamble -_begin_fstest auto quick prealloc +_begin_fstest auto quick prealloc fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/110 b/tests/generic/110 index 5d6d6ecb..ef5ac5f6 100755 --- a/tests/generic/110 +++ b/tests/generic/110 @@ -11,7 +11,7 @@ # - Modify the reflinked file # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/111 b/tests/generic/111 index 3e376096..5df0fa80 100755 --- a/tests/generic/111 +++ b/tests/generic/111 @@ -12,7 +12,7 @@ # - Modify one of the copies # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/115 b/tests/generic/115 index daaca523..13d4b537 100755 --- a/tests/generic/115 +++ b/tests/generic/115 @@ -10,7 +10,7 @@ # - Delete the original (moved) file, check that the copy still exists. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/177 b/tests/generic/177 index 8ad3f966..ff55a79f 100755 --- a/tests/generic/177 +++ b/tests/generic/177 @@ -11,7 +11,7 @@ # This test is motivated by a bug found in btrfs. # . ./common/preamble -_begin_fstest auto quick prealloc metadata punch log +_begin_fstest auto quick prealloc metadata punch log fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/225 b/tests/generic/225 index 26156c9b..d9638299 100755 --- a/tests/generic/225 +++ b/tests/generic/225 @@ -7,7 +7,7 @@ # Run the fiemap (file extent mapping) tester # . ./common/preamble -_begin_fstest auto quick +_begin_fstest auto quick fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/255 b/tests/generic/255 index 307d5287..39efb6b2 100755 --- a/tests/generic/255 +++ b/tests/generic/255 @@ -7,7 +7,7 @@ # Test Generic fallocate hole punching # . ./common/preamble -_begin_fstest auto quick prealloc punch +_begin_fstest auto quick prealloc punch fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/301 b/tests/generic/301 index faf982f5..3f895ff8 100755 --- a/tests/generic/301 +++ b/tests/generic/301 @@ -10,7 +10,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/302 b/tests/generic/302 index 01177602..9c305abe 100755 --- a/tests/generic/302 +++ b/tests/generic/302 @@ -10,7 +10,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/305 b/tests/generic/305 index 3b0ff698..b46d5127 100755 --- a/tests/generic/305 +++ b/tests/generic/305 @@ -8,7 +8,7 @@ # charged for buffered copy on write. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/316 b/tests/generic/316 index 5bc9c1d9..5b890126 100755 --- a/tests/generic/316 +++ b/tests/generic/316 @@ -7,7 +7,7 @@ # Test Generic fallocate hole punching w/o unwritten extent # . ./common/preamble -_begin_fstest auto quick punch +_begin_fstest auto quick punch fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/326 b/tests/generic/326 index 3e9332ac..f5c557b3 100755 --- a/tests/generic/326 +++ b/tests/generic/326 @@ -8,7 +8,7 @@ # charged for directio copy on write. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/327 b/tests/generic/327 index 95a22461..92540b19 100755 --- a/tests/generic/327 +++ b/tests/generic/327 @@ -7,7 +7,7 @@ # Ensure that we can't go over the hard block limit when reflinking. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/328 b/tests/generic/328 index 2b589211..db7fd3db 100755 --- a/tests/generic/328 +++ b/tests/generic/328 @@ -7,7 +7,7 @@ # Ensure that we can't go over the hard block limit when CoWing a file. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/352 b/tests/generic/352 index 608c6c81..52ec4850 100755 --- a/tests/generic/352 +++ b/tests/generic/352 @@ -11,7 +11,7 @@ # Which btrfs will soft lock up and return wrong shared flag. # . ./common/preamble -_begin_fstest auto clone +_begin_fstest auto clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/353 b/tests/generic/353 index 1ce6ce6d..9a1471bd 100755 --- a/tests/generic/353 +++ b/tests/generic/353 @@ -12,7 +12,7 @@ # This caused SHARED flag only occurs after sync. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/372 b/tests/generic/372 index b649f590..ca50ae39 100755 --- a/tests/generic/372 +++ b/tests/generic/372 @@ -7,7 +7,7 @@ # Check that bmap/fiemap accurately report shared extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap _register_cleanup "_cleanup" BUS diff --git a/tests/generic/414 b/tests/generic/414 index 6416216d..f2d63c17 100755 --- a/tests/generic/414 +++ b/tests/generic/414 @@ -8,7 +8,7 @@ # block mapping extent. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap _register_cleanup "_cleanup" BUS diff --git a/tests/generic/425 b/tests/generic/425 index 13a76563..b43294f9 100755 --- a/tests/generic/425 +++ b/tests/generic/425 @@ -8,7 +8,7 @@ # block to hold extended attributes. # . ./common/preamble -_begin_fstest auto quick attr +_begin_fstest auto quick attr fiemap _register_cleanup "_cleanup" BUS diff --git a/tests/generic/473 b/tests/generic/473 index 89241770..125b9518 100755 --- a/tests/generic/473 +++ b/tests/generic/473 @@ -9,7 +9,7 @@ # Also the test used 16k holes to be compatible with 16k block filesystems # . ./common/preamble -_begin_fstest broken +_begin_fstest broken fiemap # Import common functions. . ./common/punch diff --git a/tests/generic/483 b/tests/generic/483 index 39129542..8a8a6f24 100755 --- a/tests/generic/483 +++ b/tests/generic/483 @@ -8,7 +8,7 @@ # are placed beyond a file's size. # . ./common/preamble -_begin_fstest auto quick log metadata +_begin_fstest auto quick log metadata fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/516 b/tests/generic/516 index e846ee24..47af6237 100755 --- a/tests/generic/516 +++ b/tests/generic/516 @@ -9,7 +9,7 @@ # - Check that nothing changes in either file # . ./common/preamble -_begin_fstest auto quick dedupe clone +_begin_fstest auto quick dedupe clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/519 b/tests/generic/519 index 28747c21..0839c6b8 100755 --- a/tests/generic/519 +++ b/tests/generic/519 @@ -8,7 +8,7 @@ # 79b3dbe4adb3 fs: fix iomap_bmap position calculation # . ./common/preamble -_begin_fstest auto quick +_begin_fstest auto quick fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/540 b/tests/generic/540 index da36939a..8c66b572 100755 --- a/tests/generic/540 +++ b/tests/generic/540 @@ -17,7 +17,7 @@ # - Check that the files are now different where we say they're different. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/541 b/tests/generic/541 index a0f6cae3..227c45e1 100755 --- a/tests/generic/541 +++ b/tests/generic/541 @@ -17,7 +17,7 @@ # - Check that the files are now different where we say they're different. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/542 b/tests/generic/542 index 530fb8e0..7b413d6d 100755 --- a/tests/generic/542 +++ b/tests/generic/542 @@ -17,7 +17,7 @@ # - Check that the files are now different where we say they're different. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/543 b/tests/generic/543 index 1dad37fb..66f46e92 100755 --- a/tests/generic/543 +++ b/tests/generic/543 @@ -17,7 +17,7 @@ # - Check that the files are now different where we say they're different. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/578 b/tests/generic/578 index d04cacb4..b024f6ff 100755 --- a/tests/generic/578 +++ b/tests/generic/578 @@ -7,7 +7,7 @@ # Make sure that we can handle multiple mmap writers to the same file. . ./common/preamble -_begin_fstest auto quick rw clone +_begin_fstest auto quick rw clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/generic/654 b/tests/generic/654 index da7eaf4d..45ed19de 100755 --- a/tests/generic/654 +++ b/tests/generic/654 @@ -10,7 +10,7 @@ # the golden output; we can only compare to a check file. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/655 b/tests/generic/655 index ec8366e3..8106d15c 100755 --- a/tests/generic/655 +++ b/tests/generic/655 @@ -11,7 +11,7 @@ # the golden output; we can only compare to a check file. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/generic/677 b/tests/generic/677 index 4dbfed7d..84146c5e 100755 --- a/tests/generic/677 +++ b/tests/generic/677 @@ -9,7 +9,7 @@ # after we mount the filesystem. # . ./common/preamble -_begin_fstest auto quick log prealloc +_begin_fstest auto quick log prealloc fiemap _cleanup() { diff --git a/tests/generic/679 b/tests/generic/679 index a0094e48..ddf975a2 100755 --- a/tests/generic/679 +++ b/tests/generic/679 @@ -9,7 +9,7 @@ # space to allocate extents for the holes. # . ./common/preamble -_begin_fstest auto quick prealloc +_begin_fstest auto quick prealloc fiemap . ./common/filter . ./common/punch diff --git a/tests/generic/695 b/tests/generic/695 index b46e35cf..d53457dc 100755 --- a/tests/generic/695 +++ b/tests/generic/695 @@ -12,7 +12,7 @@ # btrfs-progs 5.15). # . ./common/preamble -_begin_fstest auto quick log punch +_begin_fstest auto quick log punch fiemap _cleanup() { diff --git a/tests/overlay/066 b/tests/overlay/066 index 163e74f1..5b9f7b18 100755 --- a/tests/overlay/066 +++ b/tests/overlay/066 @@ -8,7 +8,7 @@ # Test overlayfs copy-up function for variant sparse files. # . ./common/preamble -_begin_fstest auto quick copyup +_begin_fstest auto quick copyup fiemap # Import common functions.. . ./common/filter diff --git a/tests/shared/298 b/tests/shared/298 index bd52b6a0..807d4c87 100755 --- a/tests/shared/298 +++ b/tests/shared/298 @@ -7,7 +7,7 @@ # Test that filesystem sends discard requests only on free blocks # . ./common/preamble -_begin_fstest auto trim +_begin_fstest auto trim fiemap _supported_fs ext4 xfs btrfs _require_test diff --git a/tests/xfs/180 b/tests/xfs/180 index 9b52f1ff..cfea2020 100755 --- a/tests/xfs/180 +++ b/tests/xfs/180 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/182 b/tests/xfs/182 index 93852229..ec3f7dc0 100755 --- a/tests/xfs/182 +++ b/tests/xfs/182 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/184 b/tests/xfs/184 index 2ca6528e..e6f083f0 100755 --- a/tests/xfs/184 +++ b/tests/xfs/184 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/192 b/tests/xfs/192 index 8329604d..a4a33bc7 100755 --- a/tests/xfs/192 +++ b/tests/xfs/192 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/193 b/tests/xfs/193 index 18f2fc2f..c71aef35 100755 --- a/tests/xfs/193 +++ b/tests/xfs/193 @@ -10,7 +10,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/198 b/tests/xfs/198 index 231e1c23..c61fbab7 100755 --- a/tests/xfs/198 +++ b/tests/xfs/198 @@ -10,7 +10,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/200 b/tests/xfs/200 index 435cd9b9..eb0121e3 100755 --- a/tests/xfs/200 +++ b/tests/xfs/200 @@ -13,7 +13,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/204 b/tests/xfs/204 index 3f9b6dca..c62ad980 100755 --- a/tests/xfs/204 +++ b/tests/xfs/204 @@ -13,7 +13,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/207 b/tests/xfs/207 index ba07f1ee..4bdafd26 100755 --- a/tests/xfs/207 +++ b/tests/xfs/207 @@ -10,7 +10,7 @@ # - Ensure that whatever we set we get back later. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/208 b/tests/xfs/208 index 0fbb99c8..9a71b74f 100755 --- a/tests/xfs/208 +++ b/tests/xfs/208 @@ -14,7 +14,7 @@ # - Repeat, but with extsz = 1MB and cowextsz = $blocksize. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/209 b/tests/xfs/209 index 08ec87f5..1ef6d33d 100755 --- a/tests/xfs/209 +++ b/tests/xfs/209 @@ -7,7 +7,7 @@ # Make sure setting cowextsz on a directory propagates it to subfiles. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/210 b/tests/xfs/210 index 2439967b..5f05ab26 100755 --- a/tests/xfs/210 +++ b/tests/xfs/210 @@ -11,7 +11,7 @@ # otherwise. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/211 b/tests/xfs/211 index b99871ba..96c0b85b 100755 --- a/tests/xfs/211 +++ b/tests/xfs/211 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest clone_stress +_begin_fstest clone_stress fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/212 b/tests/xfs/212 index 805a72af..6df03608 100755 --- a/tests/xfs/212 +++ b/tests/xfs/212 @@ -10,7 +10,7 @@ # - Crash the FS to test recovery. # . ./common/preamble -_begin_fstest shutdown auto quick clone +_begin_fstest shutdown auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/213 b/tests/xfs/213 index 3e1c45cd..e1849624 100755 --- a/tests/xfs/213 +++ b/tests/xfs/213 @@ -9,7 +9,7 @@ # play with cowextsz. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/214 b/tests/xfs/214 index 7c694e92..84ba838f 100755 --- a/tests/xfs/214 +++ b/tests/xfs/214 @@ -9,7 +9,7 @@ # with cowextsz. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/231 b/tests/xfs/231 index fd7d7a85..de8a7ca9 100755 --- a/tests/xfs/231 +++ b/tests/xfs/231 @@ -12,7 +12,7 @@ # - Write more and see how bad fragmentation is. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/xfs/232 b/tests/xfs/232 index 0bf3bb75..5ca1a9f1 100755 --- a/tests/xfs/232 +++ b/tests/xfs/232 @@ -13,7 +13,7 @@ # - Write more and see how bad fragmentation is. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Override the default cleanup function. _cleanup() diff --git a/tests/xfs/252 b/tests/xfs/252 index 43740cb4..f167fd5a 100755 --- a/tests/xfs/252 +++ b/tests/xfs/252 @@ -7,7 +7,7 @@ # Test fallocate hole punching # . ./common/preamble -_begin_fstest auto quick prealloc punch +_begin_fstest auto quick prealloc punch fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/344 b/tests/xfs/344 index f87095bf..230757e4 100755 --- a/tests/xfs/344 +++ b/tests/xfs/344 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/345 b/tests/xfs/345 index 702c6d82..8511e568 100755 --- a/tests/xfs/345 +++ b/tests/xfs/345 @@ -10,7 +10,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/346 b/tests/xfs/346 index 6d371342..0cbe8ab3 100755 --- a/tests/xfs/346 +++ b/tests/xfs/346 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/347 b/tests/xfs/347 index 86f405b5..e5a2dcd4 100755 --- a/tests/xfs/347 +++ b/tests/xfs/347 @@ -11,7 +11,7 @@ # - Check the number of extents. # . ./common/preamble -_begin_fstest auto quick clone +_begin_fstest auto quick clone fiemap # Import common functions. . ./common/filter diff --git a/tests/xfs/443 b/tests/xfs/443 index de28b85b..764c63eb 100755 --- a/tests/xfs/443 +++ b/tests/xfs/443 @@ -15,7 +15,7 @@ # accounting inconsistency. # . ./common/preamble -_begin_fstest auto quick ioctl fsr punch +_begin_fstest auto quick ioctl fsr punch fiemap # Import common functions. . ./common/filter