Skip to content

Commit

Permalink
Partially revert eee9362
Browse files Browse the repository at this point in the history
With commit 34ce4c4 applied, there is no need for eee9362.
Revert that aside from the test. All tests introduced in those commits
pass.

Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: George Amanakis <[email protected]>
Closes #14502
  • Loading branch information
gamanakis authored and behlendorf committed Mar 1, 2023
1 parent 57159a5 commit 0832395
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 24 deletions.
7 changes: 7 additions & 0 deletions module/zfs/dmu_objset.c
Original file line number Diff line number Diff line change
Expand Up @@ -2408,6 +2408,13 @@ dmu_objset_id_quota_upgrade_cb(objset_t *os)
dmu_objset_userobjspace_present(os))
return (SET_ERROR(ENOTSUP));

if (dmu_objset_userobjused_enabled(os))
dmu_objset_ds(os)->ds_feature_activation[
SPA_FEATURE_USEROBJ_ACCOUNTING] = (void *)B_TRUE;
if (dmu_objset_projectquota_enabled(os))
dmu_objset_ds(os)->ds_feature_activation[
SPA_FEATURE_PROJECT_QUOTA] = (void *)B_TRUE;

err = dmu_objset_space_upgrade(os);
if (err)
return (err);
Expand Down
19 changes: 0 additions & 19 deletions module/zfs/dsl_dataset.c
Original file line number Diff line number Diff line change
Expand Up @@ -1747,25 +1747,6 @@ dsl_dataset_snapshot_sync_impl(dsl_dataset_t *ds, const char *snapname,
}
}

/*
* We are not allowed to dirty a filesystem when done receiving
* a snapshot. In this case some flags such as SPA_FEATURE_LARGE_BLOCKS
* will not be set and a subsequent encrypted raw send will fail. Hence
* activate this feature if needed here. This needs to happen only in
* syncing context.
*/
if (dmu_tx_is_syncing(tx)) {
for (spa_feature_t f = 0; f < SPA_FEATURES; f++) {
if (zfeature_active(f, ds->ds_feature_activation[f]) &&
!(zfeature_active(f, ds->ds_feature[f]))) {
dsl_dataset_activate_feature(dsobj, f,
ds->ds_feature_activation[f], tx);
ds->ds_feature[f] =
ds->ds_feature_activation[f];
}
}
}

ASSERT3U(ds->ds_prev != 0, ==,
dsl_dataset_phys(ds)->ds_prev_snap_obj != 0);
if (ds->ds_prev) {
Expand Down
5 changes: 0 additions & 5 deletions module/zfs/dsl_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -2025,11 +2025,6 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
return;
}

if (bp->blk_birth <= scn->scn_phys.scn_cur_min_txg) {
scn->scn_lt_min_this_txg++;
return;
}

bp_toread = kmem_alloc(sizeof (blkptr_t), KM_SLEEP);
*bp_toread = *bp;

Expand Down

0 comments on commit 0832395

Please sign in to comment.