c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 03:08:51 +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/dmu_objset.c
-10
View File
@@ -1695,16 +1695,6 @@ dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
&zp, dmu_objset_write_ready, NULL, NULL, dmu_objset_write_done,
os, ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
/*
* In the codepath dsl_dataset_sync()->dmu_objset_sync() we cannot
* rely on the zio above completing and calling back
* dmu_objset_write_done()->dsl_dataset_block_born() before
* dsl_dataset_sync() actually activates feature flags near its end.
* Decide here if any features need to be activated, before
* dsl_dataset_sync() completes its run.
*/
dsl_dataset_feature_set_activation(blkptr_copy, os->os_dsl_dataset);
/*
* Sync special dnodes - the parent IO for the sync is the root block
*/