From d456708525b9c12b0416bdfd68f2ecec5121c78e Mon Sep 17 00:00:00 2001 From: Tom Matthews Date: Tue, 4 Apr 2017 19:03:33 +0100 Subject: [PATCH] list -o props should be alloc,free not used,avail Manpage suggests the zpool list properties include 'used' and 'available', when these are invalid property names. Use alloc and free in their place. ``` $ zpool list -o name,size,used 2>&1 |head -1 bad property list: invalid property 'used' $ zpool list -o name,size,avail 2>&1 |head -1 bad property list: invalid property 'avail' $ zpool list -o name,size,available 2>&1 |head -1 bad property list: invalid property 'available' $ zpool list -o name,size,alloc,free NAME SIZE ALLOC FREE apool 464M 203M 261M bpool 3.62T 1.97T 1.65T ``` Reviewed-by: Giuseppe Di Natale Reviewed-by: loli10K Reviewed-by: Brian Behlendorf Signed-off-by: Tom Matthews Closes #5959 --- man/man8/zpool.8 | 2 +- .../functional/cli_user/zpool_list/zpool_list_001_pos.ksh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 index 929340fcbcff..0c053b08058e 100644 --- a/man/man8/zpool.8 +++ b/man/man8/zpool.8 @@ -1877,7 +1877,7 @@ Specify \fBu\fR for a printed representation of the internal representation of t \fB\fB-o\fR \fIprops\fR\fR .ad .RS 12n -Comma-separated list of properties to display. See the "Properties" section for a list of valid properties. The default list is "name, size, used, available, fragmentation, expandsize, capacity, dedupratio, health, altroot" +Comma-separated list of properties to display. See the "Properties" section for a list of valid properties. The default list is "name, size, alloc, free, fragmentation, expandsize, capacity, dedupratio, health, altroot" .RE .sp diff --git a/tests/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh index 4de88675fc37..29283cc072a0 100755 --- a/tests/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh @@ -50,8 +50,8 @@ fi set -A args "list $TESTPOOL" "list -H $TESTPOOL" "list" "list -H" \ "list -H -o name $TESTPOOL" "list -o name $TESTPOOL" \ "list -o name,size,capacity,health,altroot $TESTPOOL" \ - "list -H -o name,size,capacity,health,altroot $TESTPOOL" - + "list -H -o name,size,capacity,health,altroot $TESTPOOL" \ + "list -o alloc,free $TESTPOOL" log_assert "zpool list [-H] [-o filed[,filed]*] [ ...]" typeset -i i=0