c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-05-10 10:48:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

spa_sync_props: remove pool userprops by setting empty-string

Browse Source 
People have noted there's no way to remove a pool userprop, only zero
it. Turns vdev userprops had a method, by setting empty-string. So this
makes pool userprops follow the same behaviour.

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #16887
This commit is contained in:
Rob Norris 2024-12-19 20:11:54 +11:00 committed by Brian Behlendorf
parent 779c5a5deb
commit 03b7cfdef3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/zfs/spa.c
View File

@ -9683,9 +9683,17 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
if (nvpair_type(elem) == DATA_TYPE_STRING) { if (nvpair_type(elem) == DATA_TYPE_STRING) {
ASSERT(proptype == PROP_TYPE_STRING); ASSERT(proptype == PROP_TYPE_STRING);
strval = fnvpair_value_string(elem); strval = fnvpair_value_string(elem);
VERIFY0(zap_update(mos, if (strlen(strval) == 0) {
spa->spa_pool_props_object, propname, /* remove the property if value == "" */
1, strlen(strval) + 1, strval, tx)); (void) zap_remove(mos,
spa->spa_pool_props_object,
propname, tx);
} else {
VERIFY0(zap_update(mos,
spa->spa_pool_props_object,
propname, 1, strlen(strval) + 1,
strval, tx));
}
spa_history_log_internal(spa, "set", tx, spa_history_log_internal(spa, "set", tx,
"%s=%s", elemname, strval); "%s=%s", elemname, strval);
} else if (nvpair_type(elem) == DATA_TYPE_UINT64) { } else if (nvpair_type(elem) == DATA_TYPE_UINT64) {