mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-26 20:22:14 +03:00
2619 asynchronous destruction of ZFS file systems 2747 SPA versioning with zfs feature flags Reviewed by: Matt Ahrens <mahrens@delphix.com> Reviewed by: George Wilson <gwilson@delphix.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com> Approved by: Eric Schrock <Eric.Schrock@delphix.com> References: illumos/illumos-gate@53089ab7c8 illumos/illumos-gate@ad135b5d64 illumos changeset: 13700:2889e2596bd6 https://www.illumos.org/issues/2619 https://www.illumos.org/issues/2747 NOTE: The grub specific changes were not ported. This change must be made to the Linux grub packages. Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
committed by
Brian Behlendorf
parent
15313c5e18
commit
9ae529ec5d
+4
-5
@@ -21,6 +21,7 @@
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
@@ -1120,11 +1121,9 @@ ddt_sync_table(ddt_t *ddt, dmu_tx_t *tx, uint64_t txg)
|
||||
ASSERT(spa->spa_uberblock.ub_version >= SPA_VERSION_DEDUP);
|
||||
|
||||
if (spa->spa_ddt_stat_object == 0) {
|
||||
spa->spa_ddt_stat_object = zap_create(ddt->ddt_os,
|
||||
DMU_OT_DDT_STATS, DMU_OT_NONE, 0, tx);
|
||||
VERIFY(zap_add(ddt->ddt_os, DMU_POOL_DIRECTORY_OBJECT,
|
||||
DMU_POOL_DDT_STATS, sizeof (uint64_t), 1,
|
||||
&spa->spa_ddt_stat_object, tx) == 0);
|
||||
spa->spa_ddt_stat_object = zap_create_link(ddt->ddt_os,
|
||||
DMU_OT_DDT_STATS, DMU_POOL_DIRECTORY_OBJECT,
|
||||
DMU_POOL_DDT_STATS, tx);
|
||||
}
|
||||
|
||||
while ((dde = avl_destroy_nodes(&ddt->ddt_tree, &cookie)) != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user