[PATCH 0/4] Remaining patches to fix up tmpfs testing

[PATCH 0/4] Remaining patches to fix up tmpfs testing

[Theodore Ts'o]

These commits had some outstanding review comments, which have been
addressed in this patch series.

Hugh Dickins (1):
  xfstests: remove dependency on /proc/partitions for generic/312

Theodore Ts'o (3):
  generic: add _require_odirect for generic/125
  defrag: require extents support for ext4 defrag
  common: filter warning messages from mkfs.ext4

 common/defrag       | 4 +++-
 common/rc           | 2 +-
 tests/generic/125   | 1 +
 tests/generic/312   | 5 -----
 tests/generic/group | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

-- 
2.5.0

[PATCH 1/4] xfstests: remove dependency on /proc/partitions for generic/312

[Theodore Ts'o]

From: Hugh Dickins <hughd@google.com>

We don't need to do this test at all, since _scratch_mkfs_sized will
do this check for us.   This allows this test to work with tmpfs.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 tests/generic/312 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/generic/312 b/tests/generic/312
index b570814..669e19b 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -51,11 +51,6 @@ _require_scratch
 
 # 5G in byte
 fssize=$((2**30 * 5))
-required_blocks=$(($fssize / 1024))
-dev_blocks=$(grep -w $(_short_dev $SCRATCH_DEV) /proc/partitions | $AWK_PROG '{print $3}')
-if [ $required_blocks -gt $dev_blocks ];then
-	_notrun "this test requires \$SCRATCH_DEV has ${fssize}B space"
-fi
 
 rm -f $seqres.full
 _scratch_mkfs_sized $fssize >>$seqres.full 2>&1
-- 
2.5.0

[PATCH 2/4] generic: add _require_odirect for generic/125

[Theodore Ts'o]

Also remove generic/125 from the auto group, and add it to the new
pnfs group.  This is to document where this test might be useful; it's
not really going to be useful for most normal on-disk file systems, so
remove it from the auto group.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 tests/generic/125   | 1 +
 tests/generic/group | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/generic/125 b/tests/generic/125
index bcf9b3e..67eb63f 100755
--- a/tests/generic/125
+++ b/tests/generic/125
@@ -41,6 +41,7 @@ _supported_os Linux
 
 _require_test
 _require_user
+_require_odirect
 
 TESTDIR=$TEST_DIR/ftrunc
 TESTFILE=$TESTDIR/ftrunc.tmp
diff --git a/tests/generic/group b/tests/generic/group
index a47e23d..eb9748d 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -127,7 +127,7 @@
 122 auto quick clone dedupe
 123 perms auto quick
 124 pattern auto quick
-125 other auto
+125 other pnfs
 126 perms auto quick
 127 rw auto
 128 perms auto quick
-- 
2.5.0

[PATCH 3/4] defrag: require extents support for ext4 defrag

[Theodore Ts'o]

The e4defrag program requires the use of fallocate, which in turn
means that the file system must have extents.  Enforce this
requirement so we don't get test failure noise when testing ext4's
ext3 compatibility.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 common/defrag | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/defrag b/common/defrag
index 942593e..6fbf830 100644
--- a/common/defrag
+++ b/common/defrag
@@ -27,7 +27,9 @@ _require_defrag()
         DEFRAG_PROG="$XFS_FSR_PROG"
 	;;
     ext4|ext4dev)
-        DEFRAG_PROG="$E4DEFRAG_PROG"
+	DEFRAG_PROG="$E4DEFRAG_PROG"
+	dumpe2fs -h $SCRATCH_DEV 2> /dev/null | grep -wq extent || \
+	     _notrun "file system does not have extents, needed for defrag"
 	;;
     btrfs)
 	DEFRAG_PROG="$BTRFS_UTIL_PROG filesystem defragment"
-- 
2.5.0

[PATCH 4/4] common: filter warning messages from mkfs.ext4

[Theodore Ts'o]

Commit 4a5cda8102828 ("xfstests: do not unmount tmpfs during remount")
changed generic/135 to no longer redirect stderr to /dev/null when
running _scratch_mkfs.  This caused ext4 using a 1k block size to fail
when running this test because mkfs.ext4 would issue a warning message
about the use of a non-block size that wasn't expected by golden
output for the test.  Fix this by filtering out warning messages in
_scratch_mkfs_ext4.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index f07b274..5fb3282 100644
--- a/common/rc
+++ b/common/rc
@@ -655,7 +655,7 @@ _scratch_mkfs_ext4()
 	fi
 
 	# output stored mkfs output
-	cat $tmp_dir.mkfserr >&2
+	grep -v ^Warning: $tmp_dir.mkfserr >&2
 	cat $tmp_dir.mkfsstd
 	rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd
 
-- 
2.5.0

Re: [PATCH 1/4] xfstests: remove dependency on /proc/partitions for generic/312

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 2/4] generic: add _require_odirect for generic/125

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 3/4] defrag: require extents support for ext4 defrag

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH 4/4] common: filter warning messages from mkfs.ext4

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>