From 9292cf761e949cb52287d98da895a61c49b98561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 5 Apr 2022 18:34:46 +0200 Subject: [PATCH] Fix string/index variables being unflexed by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I got the status backward (B_FALSE for fixed, rather than B_TRUE for flex); before: $ zfs get mountpoint tarta-zoot -r NAME PROPERTY VALUE SOURCE tarta-zoot mountpoint / local tarta-zoot/PAGEFILE.SYS mountpoint - - tarta-zoot/etc mountpoint /etc inherited from tarta-zoot tarta-zoot/home mountpoint /home inherited from tarta-zoot tarta-zoot/home/xspon mountpoint /home/xspon inherited from tarta-zoot tarta-zoot/home/nabijaczleweli mountpoint /home/nabijaczleweli inherited from tarta-zoot tarta-zoot/home/nabijaczleweli/tftp mountpoint /home/nabijaczleweli/tftp inherited from tarta-zoot tarta-zoot/home/root mountpoint /root local after: $ zfs get mountpoint tarta-zoot -r NAME PROPERTY VALUE SOURCE tarta-zoot mountpoint / local tarta-zoot/PAGEFILE.SYS mountpoint - - tarta-zoot/etc mountpoint /etc inherited from tarta-zoot tarta-zoot/home mountpoint /home inherited from tarta-zoot tarta-zoot/home/xspon mountpoint /home/xspon inherited from tarta-zoot tarta-zoot/home/nabijaczleweli mountpoint /home/nabijaczleweli inherited from tarta-zoot tarta-zoot/home/nabijaczleweli/tftp mountpoint /home/nabijaczleweli/tftp inherited from tarta-zoot tarta-zoot/home/root mountpoint /root local Fixes: be8e1d81bf2b85f6f76851b7013ac54e9bf488f0 ("Flex non-pretty-printed properties and raw-/pretty-print remaining ones") Reviewed-by: Brian Behlendorf Signed-off-by: Ahelenia Ziemiańska Closes #13286 --- module/zcommon/zprop_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c index 0f49687757..b1da4ca64b 100644 --- a/module/zcommon/zprop_common.c +++ b/module/zcommon/zprop_common.c @@ -136,7 +136,7 @@ zprop_register_string(int prop, const char *name, const char *def, const char *colname, const struct zfs_mod_supported_features *sfeatures) { zprop_register_impl(prop, name, PROP_TYPE_STRING, 0, def, attr, - objset_types, values, colname, B_FALSE, B_TRUE, B_FALSE, NULL, + objset_types, values, colname, B_FALSE, B_TRUE, B_TRUE, NULL, sfeatures); } @@ -159,7 +159,7 @@ zprop_register_index(int prop, const char *name, uint64_t def, const struct zfs_mod_supported_features *sfeatures) { zprop_register_impl(prop, name, PROP_TYPE_INDEX, def, NULL, attr, - objset_types, values, colname, B_FALSE, B_TRUE, B_FALSE, idx_tbl, + objset_types, values, colname, B_FALSE, B_TRUE, B_TRUE, idx_tbl, sfeatures); }