From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Subject: [PATCH 02/17] xfs: use rmapbt-checking helper Date: Thu, 21 Jul 2016 16:46:29 -0700 [thread overview] Message-ID: <146914478956.11762.1523179302392973799.stgit@birch.djwong.org> (raw) In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> Don't open-code _notrun checks for the rmapbt, just use the helper. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- tests/xfs/310 | 4 +--- tests/xfs/314 | 4 +--- tests/xfs/317 | 4 +--- tests/xfs/322 | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/xfs/310 b/tests/xfs/310 index 36b683c..bfdec39 100755 --- a/tests/xfs/310 +++ b/tests/xfs/310 @@ -47,6 +47,7 @@ _cleanup() _supported_os Linux _supported_fs xfs _require_scratch +_require_xfs_scratch_rmapbt _require_xfs_io_command "falloc" rm -f $seqres.full @@ -56,9 +57,6 @@ echo "Figure out block size" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - testdir=$SCRATCH_MNT/test-$seq blksz="$(stat -f $SCRATCH_MNT -c '%S')" diff --git a/tests/xfs/314 b/tests/xfs/314 index 6b867b8..ec16c6f 100755 --- a/tests/xfs/314 +++ b/tests/xfs/314 @@ -48,6 +48,7 @@ _supported_os Linux _supported_fs xfs _require_cp_reflink _require_scratch_reflink +_require_xfs_scratch_rmapbt _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" @@ -60,9 +61,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" _pwrite_byte 0x66 0 $sz $SCRATCH_MNT/file1 >> $seqres.full _cp_reflink $SCRATCH_MNT/file1 $SCRATCH_MNT/file2 diff --git a/tests/xfs/317 b/tests/xfs/317 index ac9f3ae..507c2a9 100755 --- a/tests/xfs/317 +++ b/tests/xfs/317 @@ -45,6 +45,7 @@ _cleanup() _supported_os Linux _supported_fs xfs _require_scratch +_require_xfs_scratch_rmapbt _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" @@ -57,9 +58,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" touch $SCRATCH_MNT/file1 _pwrite_byte 0x67 0 $sz $SCRATCH_MNT/file0 >> $seqres.full diff --git a/tests/xfs/322 b/tests/xfs/322 index 0dddb1f..ef402c8 100755 --- a/tests/xfs/322 +++ b/tests/xfs/322 @@ -48,6 +48,7 @@ _supported_os Linux _supported_fs xfs _require_cp_reflink _require_scratch_reflink +_require_xfs_scratch_rmapbt _require_xfs_io_error_injection "rmap_finish_one" rm -f $seqres.full @@ -59,9 +60,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" _pwrite_byte 0x66 0 $sz $SCRATCH_MNT/file1 >> $seqres.full $XFS_IO_PROG -f -c "truncate $sz" $SCRATCH_MNT/file3 >> $seqres.full
WARNING: multiple messages have this Message-ID (diff)
From: "Darrick J. Wong" <darrick.wong@oracle.com> To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Cc: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org, xfs@oss.sgi.com Subject: [PATCH 02/17] xfs: use rmapbt-checking helper Date: Thu, 21 Jul 2016 16:46:29 -0700 [thread overview] Message-ID: <146914478956.11762.1523179302392973799.stgit@birch.djwong.org> (raw) In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> Don't open-code _notrun checks for the rmapbt, just use the helper. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- tests/xfs/310 | 4 +--- tests/xfs/314 | 4 +--- tests/xfs/317 | 4 +--- tests/xfs/322 | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/xfs/310 b/tests/xfs/310 index 36b683c..bfdec39 100755 --- a/tests/xfs/310 +++ b/tests/xfs/310 @@ -47,6 +47,7 @@ _cleanup() _supported_os Linux _supported_fs xfs _require_scratch +_require_xfs_scratch_rmapbt _require_xfs_io_command "falloc" rm -f $seqres.full @@ -56,9 +57,6 @@ echo "Figure out block size" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - testdir=$SCRATCH_MNT/test-$seq blksz="$(stat -f $SCRATCH_MNT -c '%S')" diff --git a/tests/xfs/314 b/tests/xfs/314 index 6b867b8..ec16c6f 100755 --- a/tests/xfs/314 +++ b/tests/xfs/314 @@ -48,6 +48,7 @@ _supported_os Linux _supported_fs xfs _require_cp_reflink _require_scratch_reflink +_require_xfs_scratch_rmapbt _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" @@ -60,9 +61,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" _pwrite_byte 0x66 0 $sz $SCRATCH_MNT/file1 >> $seqres.full _cp_reflink $SCRATCH_MNT/file1 $SCRATCH_MNT/file2 diff --git a/tests/xfs/317 b/tests/xfs/317 index ac9f3ae..507c2a9 100755 --- a/tests/xfs/317 +++ b/tests/xfs/317 @@ -45,6 +45,7 @@ _cleanup() _supported_os Linux _supported_fs xfs _require_scratch +_require_xfs_scratch_rmapbt _require_error_injection _require_xfs_io_error_injection "rmap_finish_one" @@ -57,9 +58,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" touch $SCRATCH_MNT/file1 _pwrite_byte 0x67 0 $sz $SCRATCH_MNT/file0 >> $seqres.full diff --git a/tests/xfs/322 b/tests/xfs/322 index 0dddb1f..ef402c8 100755 --- a/tests/xfs/322 +++ b/tests/xfs/322 @@ -48,6 +48,7 @@ _supported_os Linux _supported_fs xfs _require_cp_reflink _require_scratch_reflink +_require_xfs_scratch_rmapbt _require_xfs_io_error_injection "rmap_finish_one" rm -f $seqres.full @@ -59,9 +60,6 @@ echo "Format filesystem" _scratch_mkfs >/dev/null 2>&1 _scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -test $is_rmap -gt 0 || _notrun "rmap not supported on scratch fs" - echo "Create files" _pwrite_byte 0x66 0 $sz $SCRATCH_MNT/file1 >> $seqres.full $XFS_IO_PROG -f -c "truncate $sz" $SCRATCH_MNT/file3 >> $seqres.full _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2016-07-21 23:46 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-21 23:46 [PATCH v7 00/17] xfstests: fixes and new tests for rmap/reflink/etc Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-07-21 23:46 ` [PATCH 01/17] xfs/26[34]: remove duplicate tests Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-08-01 6:25 ` Christoph Hellwig 2016-08-01 6:25 ` Christoph Hellwig 2016-07-21 23:46 ` Darrick J. Wong [this message] 2016-07-21 23:46 ` [PATCH 02/17] xfs: use rmapbt-checking helper Darrick J. Wong 2016-08-01 6:25 ` Christoph Hellwig 2016-08-01 6:25 ` Christoph Hellwig 2016-07-21 23:46 ` [PATCH 03/17] xfs/310: fix the size calculation for the huge device Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-08-01 6:25 ` Christoph Hellwig 2016-08-01 6:25 ` Christoph Hellwig 2016-07-21 23:46 ` [PATCH 04/17] xfs/122: list the new log redo items Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-08-01 6:26 ` Christoph Hellwig 2016-08-01 6:26 ` Christoph Hellwig 2016-07-21 23:46 ` [PATCH 05/17] common/reflink: actually test dedupe on scratch device Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-08-01 6:26 ` Christoph Hellwig 2016-08-01 6:26 ` Christoph Hellwig 2016-07-21 23:46 ` [PATCH 06/17] xfs: run xfs_repair at the end of each test Darrick J. Wong 2016-07-21 23:46 ` Darrick J. Wong 2016-08-01 6:27 ` Christoph Hellwig 2016-08-01 6:27 ` Christoph Hellwig 2016-08-01 17:08 ` Darrick J. Wong 2016-08-01 17:08 ` Darrick J. Wong 2016-08-02 12:24 ` Christoph Hellwig 2016-08-02 12:24 ` Christoph Hellwig 2016-08-03 9:15 ` Eryu Guan 2016-08-03 9:15 ` Eryu Guan 2016-08-03 22:08 ` Darrick J. Wong 2016-08-03 22:08 ` Darrick J. Wong 2016-08-03 22:45 ` [PATCH v2 06/17] xfs: optionally test xfs_repair index rebuilding " Darrick J. Wong 2016-08-03 22:45 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 07/17] xfs/128: cycle_mount the scratch device, not the test device Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:27 ` Christoph Hellwig 2016-08-01 6:27 ` Christoph Hellwig 2016-08-03 9:37 ` Eryu Guan 2016-08-03 9:37 ` Eryu Guan 2016-08-03 22:09 ` Darrick J. Wong 2016-08-03 22:09 ` Darrick J. Wong 2016-08-03 22:48 ` [PATCH v2 " Darrick J. Wong 2016-08-03 22:48 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 08/17] xfs/129: fix post-metadump remounting idiocy Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:27 ` Christoph Hellwig 2016-08-01 6:27 ` Christoph Hellwig 2016-07-21 23:47 ` [PATCH 09/17] common/dmerror: fix mount option issues Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:28 ` Christoph Hellwig 2016-08-01 6:28 ` Christoph Hellwig 2016-08-03 10:38 ` Eryu Guan 2016-08-03 10:38 ` Eryu Guan 2016-08-03 22:14 ` Darrick J. Wong 2016-08-03 22:14 ` Darrick J. Wong 2016-08-03 22:50 ` [PATCH v2 " Darrick J. Wong 2016-08-03 22:50 ` Darrick J. Wong 2016-08-04 0:33 ` Darrick J. Wong 2016-08-04 0:33 ` Darrick J. Wong 2016-08-04 0:34 ` [PATCH v3 " Darrick J. Wong 2016-08-04 0:34 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 10/17] xfs/179: use scratch device helpers Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:28 ` Christoph Hellwig 2016-08-01 6:28 ` Christoph Hellwig 2016-07-21 23:47 ` [PATCH 11/17] xfs/234: " Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:29 ` Christoph Hellwig 2016-08-01 6:29 ` Christoph Hellwig 2016-07-21 23:47 ` [PATCH 12/17] reflink: test cross-mountpoint reflink and dedupe Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-01 6:29 ` Christoph Hellwig 2016-08-01 6:29 ` Christoph Hellwig 2016-08-08 7:56 ` Eryu Guan 2016-08-08 7:56 ` Eryu Guan 2016-08-08 17:28 ` Darrick J. Wong 2016-08-08 17:28 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 13/17] xfs: test swapext with reflink Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-08 8:13 ` Eryu Guan 2016-08-08 8:13 ` Eryu Guan 2016-08-08 17:41 ` Darrick J. Wong 2016-08-08 17:41 ` Darrick J. Wong 2016-08-09 6:29 ` Dave Chinner 2016-08-09 6:29 ` Dave Chinner 2016-08-19 21:53 ` Darrick J. Wong 2016-08-19 21:53 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 14/17] xfs: more rmapbt tests Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-08 8:48 ` Eryu Guan 2016-08-08 8:48 ` Eryu Guan 2016-08-08 17:59 ` Darrick J. Wong 2016-08-08 17:59 ` Darrick J. Wong 2016-07-21 23:47 ` [PATCH 15/17] xfs: scrub fs (if still mounted) at the end of the test Darrick J. Wong 2016-07-21 23:47 ` Darrick J. Wong 2016-08-08 8:52 ` Eryu Guan 2016-08-08 8:52 ` Eryu Guan 2016-08-08 18:03 ` Darrick J. Wong 2016-08-08 18:03 ` Darrick J. Wong 2016-07-21 23:48 ` [PATCH 16/17] xfs/122: add the realtime rmapbt inode and btree fields Darrick J. Wong 2016-07-21 23:48 ` Darrick J. Wong 2016-08-01 6:30 ` Christoph Hellwig 2016-08-01 6:30 ` Christoph Hellwig 2016-07-21 23:48 ` [PATCH 17/17] xfs: test realtime rmapbt code Darrick J. Wong 2016-07-21 23:48 ` Darrick J. Wong 2016-08-08 9:08 ` Eryu Guan 2016-08-08 9:08 ` Eryu Guan 2016-08-08 18:18 ` Darrick J. Wong 2016-08-08 18:18 ` Darrick J. Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=146914478956.11762.1523179302392973799.stgit@birch.djwong.org \ --to=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=eguan@redhat.com \ --cc=fstests@vger.kernel.org \ --cc=linux-btrfs@vger.kernel.org \ --cc=xfs@oss.sgi.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.