btrfs/006: fails with mixed-mode/small disks

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 <Anand.Jain@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/filter b/common/filter
index c872a27bcba437772731071c5425378205c59490..04d12c4ff23b7bdd1ffe71a418c463ad93e08753 100644 (file)
--- 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 29512cd3cd6e02f7bffa4a59ec08d491fb388ac4..75853f29038652406935187b76b34d369f4106c8 100644 (file)
--- 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
 }