[2/2] xfstest: tests btrfs/006 fails with mixed-mode/small disks

Commit Message

Anand Jain Jan. 13, 2014, 1:16 p.m. UTC

From: Anand Jain <[e-mail]>

as of now the script does not filter 0.00 size  in the
filesystem show output, which is the case in multi-disk
mixed-mode (that is default group type for small disks)

Signed-off-by: Anand Jain <[e-mail]>
---
 common/filter       | 6 ++++++
 common/filter.btrfs | 1 +
 2 files changed, 7 insertions(+)

Patch

diff --git a/common/filter b/common/filter
index c872a27..04d12c4 100644
--- a/common/filter
+++ b/common/filter
@@ -277,6 +277,12 @@  _filter_uuid()
 	fi
 }
 
+# In mixed group the added disks may have zero used size
+_filter_zero_size()
+{
+	sed -e "s/0\.00/<SIZE>/g"
+}
+
 # Filter out sizes like 6.14MB etc
 _filter_size()
 {
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..75853f2 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -33,6 +33,7 @@  _filter_btrfs_filesystem_show()
 	# the uniq collapses all device lines into 1
 	_filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
 	_filter_size | _filter_btrfs_version | _filter_devid | \
+	_filter_zero_size | \
 	sed -e "s/\(Total devices\) $NUMDEVS/\1 $NUM_SUBST/g" | \
 	uniq
 }