From 83adc23130d1539c94c349009cd27eb71c01aedc Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 20 Jan 2014 13:28:38 +1100 Subject: [PATCH] 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 Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/filter | 6 ++++++ common/filter.btrfs | 1 + 2 files changed, 7 insertions(+) diff --git a/common/filter b/common/filter index c872a27b..04d12c4f 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//g" +} + # Filter out sizes like 6.14MB etc _filter_size() { diff --git a/common/filter.btrfs b/common/filter.btrfs index 29512cd3..75853f29 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 } -- 2.39.5