reset project quota/cmn_err

Signed-off-by: George Amanakis <[email protected]>
openzfs · Mar 3, 2021 · 1ef7f60 · 1ef7f60
1 parent 9132142
commit 1ef7f60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
@@ -2296,6 +2296,7 @@ dmu_objset_space_upgrade(objset_t *os)
 	 */
 
 	for (obj = 0; err == 0; err = dmu_object_next(os, &obj, FALSE, 0)) {
+		cmn_err(CE_NOTE, "space upgrade: %llu", obj);
 		dmu_tx_t *tx;
 		dmu_buf_t *db;
 		int objerr;

diff --git a/module/zfs/dsl_crypt.c b/module/zfs/dsl_crypt.c
@@ -2104,6 +2104,7 @@ dsl_crypto_recv_raw_objset_sync(dsl_dataset_t *ds, dmu_objset_type_t ostype,
 	 */
 	os->os_phys->os_flags &= ~OBJSET_FLAG_USERACCOUNTING_COMPLETE;
 	os->os_phys->os_flags &= ~OBJSET_FLAG_USEROBJACCOUNTING_COMPLETE;
+	os->os_phys->os_flags &= ~OBJSET_FLAG_PROJECTQUOTA_COMPLETE;
 	os->os_flags = os->os_phys->os_flags;
 	os->os_next_write_raw[tx->tx_txg & TXG_MASK] = B_TRUE;
 
@@ -2112,6 +2113,7 @@ dsl_crypto_recv_raw_objset_sync(dsl_dataset_t *ds, dmu_objset_type_t ostype,
 	 */
 	dmu_object_free(os, DMU_USERUSED_OBJECT, tx);
 	dmu_object_free(os, DMU_GROUPUSED_OBJECT, tx);
+	dmu_object_free(os, DMU_PROJECTUSED_OBJECT, tx);
 
 	/* set metadnode compression and checksum */
 	mdn->dn_compress = compress;