summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Matthews <[email protected]>2017-04-04 19:03:33 +0100
committerBrian Behlendorf <[email protected]>2017-04-04 11:03:33 -0700
commitd456708525b9c12b0416bdfd68f2ecec5121c78e (patch)
tree9e09f62e7e6443a15c11b3a484f940368b77cce6
parentbcdb96a3e197ebe64048464c19f505637b8bb7ba (diff)
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 <[email protected]> Reviewed-by: loli10K <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Matthews <[email protected]> Closes #5959
-rw-r--r--man/man8/zpool.82
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_user/zpool_list/zpool_list_001_pos.ksh4
2 files changed, 3 insertions, 3 deletions
diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
index 929340fcb..0c053b080 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 4de88675f..29283cc07 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]*] [<pool_name> ...]"
typeset -i i=0