aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/zfs/dsl_crypt.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2023-04-23 10:12:49 +0000
committerMartin Matuska <mm@FreeBSD.org>2023-04-23 10:12:49 +0000
commit7005cd44040529b55573cff6212fde9e3d845215 (patch)
treef192e8551db7c20aeb0a9a94d875a30ed04bb829 /sys/contrib/openzfs/module/zfs/dsl_crypt.c
parent4b0899ae6686fad5e1ef6dec6e812c94ffadcca1 (diff)
parente25f9131d679692704c11dc0c1df6d4585b70c35 (diff)
zfs: merge openzfs/zfs@e25f9131d (zfs-2.1-release) into stable/13
OpenZFS release 2.1.11 Notable upstream pull requeset merges: #13368 ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced() (reverted) #13758 Allow mounting snapshots in .zfs/snapshot as a regular user #13816 Fix a race condition in dsl_dataset_sync() when activating features #14039 Optimize microzaps #14196 Remove atomics from zh_refcount #14198 Switch dnode stats to wmsums #14199 Remove few pointer dereferences in dbuf_read() #14200 Micro-optimize zrl_remove() #14218 Avoid a null pointer dereference in zfs_mount() on FreeBSD #14293 Turn default_bs and default_ibs into ZFS_MODULE_PARAMs #14317 Pack zrlock_t by 8 bytes #14402 Prefetch on deadlists merge #14418 Introduce minimal ZIL block commit delay #14448 Fix console progress reporting for recursive send #14454 Improve arc_read() error reporting #14502 Partially revert f806306ce0 "Activate filesystem features only in syncing context" #14516 System-wide speculative prefetch limit #14523 Move dmu_buf_rele() after dsl_dataset_sync_done() #14563 Optimize the is_l2cacheable functions #14573 Add missing increment to dsl_deadlist_move_bpobj() #14621 Colorize patchset #14639 FreeBSD: Remove extra arc_reduce_target_size() call #14641 Additional limits on hole reporting #14653 Update vdev state for spare vdev #14712 Fix "Add colored output to zfs list" #14761 Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" Obtained from: OpenZFS OpenZFS tag: zfs-2.1.11 OpenZFS commit: e25f9131d679692704c11dc0c1df6d4585b70c35 Relnotes: yes
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/dsl_crypt.c')
-rw-r--r--sys/contrib/openzfs/module/zfs/dsl_crypt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/contrib/openzfs/module/zfs/dsl_crypt.c b/sys/contrib/openzfs/module/zfs/dsl_crypt.c
index bf1f55e68ff5..872174f5f90d 100644
--- a/sys/contrib/openzfs/module/zfs/dsl_crypt.c
+++ b/sys/contrib/openzfs/module/zfs/dsl_crypt.c
@@ -2120,9 +2120,6 @@ dsl_crypto_recv_raw_objset_sync(dsl_dataset_t *ds, dmu_objset_type_t ostype,
zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
dsl_dataset_sync(ds, zio, tx);
VERIFY0(zio_wait(zio));
-
- /* dsl_dataset_sync_done will drop this reference. */
- dmu_buf_add_ref(ds->ds_dbuf, ds);
dsl_dataset_sync_done(ds, tx);
}
}