diff options
| author | loli10K <[email protected]> | 2020-11-16 18:10:29 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-16 09:10:29 -0800 |
| commit | 4072f465bc3630bbab50afccfd6c7baf41afcc4c (patch) | |
| tree | 3eabc85191eb9d0fb9dd788fe1e1305596d2a728 /include | |
| parent | 2c210f68189c6f781be050bfdc890cd6dc231fea (diff) | |
Fix 'zfs userspace' for received datasets in encrypted root
For encrypted receives, where user accounting is initially disabled on
creation, both 'zfs userspace' and 'zfs groupspace' fails with
EOPNOTSUPP: this is because dmu_objset_id_quota_upgrade_cb() forgets to
set OBJSET_FLAG_USERACCOUNTING_COMPLETE on the objset flags after a
successful dmu_objset_space_upgrade().
Reviewed-by: Brian Behlendorf <[email protected]>
Co-authored-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #9501
Closes #9596
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/dmu_objset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h index 1af69832c..f27417c1f 100644 --- a/include/sys/dmu_objset.h +++ b/include/sys/dmu_objset.h @@ -245,7 +245,7 @@ void dmu_objset_evict(objset_t *os); void dmu_objset_do_userquota_updates(objset_t *os, dmu_tx_t *tx); void dmu_objset_userquota_get_ids(dnode_t *dn, boolean_t before, dmu_tx_t *tx); boolean_t dmu_objset_userused_enabled(objset_t *os); -int dmu_objset_userspace_upgrade(objset_t *os); +void dmu_objset_userspace_upgrade(objset_t *os); boolean_t dmu_objset_userspace_present(objset_t *os); boolean_t dmu_objset_userobjused_enabled(objset_t *os); boolean_t dmu_objset_userobjspace_upgradable(objset_t *os); |