Skip to content

Commit f71c16a

Browse files
chrisperedunbehlendorf
authored andcommitted
Don't panic on unencrypted block in encrypted dataset
While 763ca47 closes the situation of block cloning creating unencrypted records in encrypted datasets, existing data still causes panic on read. Setting zfs_recover bypasses this but at the cost of potentially ignoring more serious issues. Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Chris Peredun <[email protected]> Closes #15677
1 parent 9c40ae0 commit f71c16a

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

module/zfs/dbuf.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,8 +1619,6 @@ dbuf_read_impl(dmu_buf_impl_t *db, zio_t *zio, uint32_t flags,
16191619
*/
16201620
if (db->db_objset->os_encrypted && !BP_USES_CRYPT(bpp)) {
16211621
spa_log_error(db->db_objset->os_spa, &zb, &bpp->blk_birth);
1622-
zfs_panic_recover("unencrypted block in encrypted "
1623-
"object set %llu", dmu_objset_id(db->db_objset));
16241622
err = SET_ERROR(EIO);
16251623
goto early_unlock;
16261624
}

module/zfs/dmu_send.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,8 +1124,6 @@ send_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
11241124
if (sta->os->os_encrypted &&
11251125
!BP_IS_HOLE(bp) && !BP_USES_CRYPT(bp)) {
11261126
spa_log_error(spa, zb, &bp->blk_birth);
1127-
zfs_panic_recover("unencrypted block in encrypted "
1128-
"object set %llu", dmu_objset_id(sta->os));
11291127
return (SET_ERROR(EIO));
11301128
}
11311129

0 commit comments

Comments
 (0)