diff options
| author | mm <mm@FreeBSD.org> | 2012-08-19 09:59:41 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-08-19 09:59:41 +0000 |
| commit | 52807f49b2cb7b76e0de31ecad0ac6f5534dab0f (patch) | |
| tree | 93df05208cf641e57f57ccb432828b28d1f38e35 /sys/cddl | |
| parent | 4b20dde343adae4e0131cbd74bae76afe8abf19b (diff) | |
| download | FreeBSD-src-52807f49b2cb7b76e0de31ecad0ac6f5534dab0f.zip FreeBSD-src-52807f49b2cb7b76e0de31ecad0ac6f5534dab0f.tar.gz | |
Backport fix for vendor issue #3085
3085 zfs diff panics, then panics in a loop on booting
References:
https://www.illumos.org/issues/3085
PR: kern/170763
Obtained from: ssh://anonhg@hg.illumos.org/illumos-gate (r13772)
MFC after: 1 week
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c index c445278..4aad2c9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c @@ -3969,6 +3969,11 @@ dsl_dataset_user_release_sync(void *arg1, void *tag, dmu_tx_t *tx) VERIFY(error == 0 || error == ENOENT); zapobj = ds->ds_phys->ds_userrefs_obj; VERIFY(0 == zap_remove(mos, zapobj, ra->htag, tx)); + + spa_history_log_internal(LOG_DS_USER_RELEASE, + dp->dp_spa, tx, "<%s> %lld dataset = %llu", + ra->htag, (longlong_t)refs, dsobj); + if (ds->ds_userrefs == 0 && ds->ds_phys->ds_num_children == 1 && DS_IS_DEFER_DESTROY(ds)) { struct dsl_ds_destroyarg dsda = {0}; @@ -3979,10 +3984,6 @@ dsl_dataset_user_release_sync(void *arg1, void *tag, dmu_tx_t *tx) /* We already did the destroy_check */ dsl_dataset_destroy_sync(&dsda, tag, tx); } - - spa_history_log_internal(LOG_DS_USER_RELEASE, - dp->dp_spa, tx, "<%s> %lld dataset = %llu", - ra->htag, (longlong_t)refs, dsobj); } static int |
