Author: mm
Date: Sun Aug 19 09:34:04 2012
New Revision: 239388
URL: http://svn.freebsd.org/changeset/base/239388
Log:
Update vendor-sys/illumos/dist to illumos-gate 13772:2579580ac955
References:
https://www.illumos.org/issues/3085 (zfs diff panics)
Obtained from: ssh://ano...@hg.illumos.org/illumos-gate
Modified:
vendor-sys/illumos/dist/uts/common/Makefile.files
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c
Modified: vendor-sys/illumos/dist/uts/common/Makefile.files
==============================================================================
--- vendor-sys/illumos/dist/uts/common/Makefile.files Sun Aug 19 09:30:58
2012 (r239387)
+++ vendor-sys/illumos/dist/uts/common/Makefile.files Sun Aug 19 09:34:04
2012 (r239388)
@@ -1846,7 +1846,7 @@ IDM_OBJS += $(IDM_SHARED_OBJS) \
VR_OBJS += vr.o
-ATGE_OBJS += atge_main.o atge_l1e.o atge_mii.o atge_l1.o
+ATGE_OBJS += atge_main.o atge_l1e.o atge_mii.o atge_l1.o atge_l1c.o
YGE_OBJS = yge.o
@@ -1921,7 +1921,7 @@ IXGBE_OBJS = ixgbe_82598.o ixgbe_8259
ixgbe_buf.o ixgbe_debug.o ixgbe_gld.o \
ixgbe_log.o ixgbe_main.o \
ixgbe_osdep.o ixgbe_rx.o ixgbe_stat.o \
- ixgbe_tx.o
+ ixgbe_tx.o ixgbe_x540.o ixgbe_mbx.o
#
# NIU 10G/1G driver module
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sun Aug 19
09:30:58 2012 (r239387)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sun Aug 19
09:34:04 2012 (r239388)
@@ -3903,6 +3903,10 @@ dsl_dataset_user_release_sync(void *arg1
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_ds(ds, "release", tx,
+ "tag = %s refs now = %lld", ra->htag, (longlong_t)refs);
+
if (ds->ds_userrefs == 0 && ds->ds_phys->ds_num_children == 1 &&
DS_IS_DEFER_DESTROY(ds)) {
struct dsl_ds_destroyarg dsda = {0};
@@ -3913,9 +3917,6 @@ dsl_dataset_user_release_sync(void *arg1
/* We already did the destroy_check */
dsl_dataset_destroy_sync(&dsda, tag, tx);
}
-
- spa_history_log_internal_ds(ds, "release", tx,
- "tag = %s refs now = %lld", ra->htag, (longlong_t)refs);
}
static int
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c Sun Aug 19
09:30:58 2012 (r239387)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_history.c Sun Aug 19
09:34:04 2012 (r239388)
@@ -440,8 +440,10 @@ log_internal(nvlist_t *nvl, const char *
* If this is part of creating a pool, not everything is
* initialized yet, so don't bother logging the internal events.
*/
- if (tx->tx_txg == TXG_INITIAL)
+ if (tx->tx_txg == TXG_INITIAL) {
+ fnvlist_free(nvl);
return;
+ }
msg = kmem_alloc(vsnprintf(NULL, 0, fmt, adx) + 1, KM_SLEEP);
(void) vsprintf(msg, fmt, adx);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
