c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-25 11:47:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Avoid panic with recordsize > 128k, raw sending and no large_blocks"

Browse Source 
This reverts commit 80a650b7bb.  This change
inadvertently introduced a regression in ztest where one of the new ASSERTs
is triggered in dsl_scan_visitbp().

Reviewed-by: George Amanakis <gamanakis@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #12275 
Closes #13799
This commit is contained in:
Brian Behlendorf
2022-08-25 13:33:32 -07:00
committed by GitHub
parent a582d52993
commit 9f346abbe8
6 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/dsl_scan.c
-15
View File
@@ -2008,21 +2008,6 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
return;
}
/*
* Check if this block contradicts any filesystem flags.
*/
spa_feature_t f = SPA_FEATURE_LARGE_BLOCKS;
if (BP_GET_LSIZE(bp) > SPA_OLD_MAXBLOCKSIZE)
ASSERT3B(dsl_dataset_feature_is_active(ds, f), ==, B_TRUE);
f = zio_checksum_to_feature(BP_GET_CHECKSUM(bp));
if (f != SPA_FEATURE_NONE)
ASSERT3B(dsl_dataset_feature_is_active(ds, f), ==, B_TRUE);
f = zio_compress_to_feature(BP_GET_COMPRESS(bp));
if (f != SPA_FEATURE_NONE)
ASSERT3B(dsl_dataset_feature_is_active(ds, f), ==, B_TRUE);
if (bp->blk_birth <= scn->scn_phys.scn_cur_min_txg) {
scn->scn_lt_min_this_txg++;
return;