svn commit: r248437 - projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

Author: mm
Date: Sun Mar 17 18:49:11 2013
New Revision: 248437
URL: http://svnweb.freebsd.org/changeset/base/248437

Log:
  Merge libzfs_core part of r239388
  
  Illumos ZFS issues:
    3085 zfs diff panics, then panics in a loop on booting
  
  References:
    https://www.illumos.org/issues/3085

Modified:
  projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c

Modified: projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
==============================================================================
--- projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Sun Mar 17 18:34:09 2013	(r248436)
+++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c	Sun Mar 17 18:49:11 2013	(r248437)
@@ -444,8 +444,10 @@ log_internal(nvlist_t *nvl, const char *
 	 * initialized yet, so don't bother logging the internal events.
 	 * Likewise if the pool is not writeable.
 	 */
-	if (tx->tx_txg == TXG_INITIAL || !spa_writeable(spa))
+	if (tx->tx_txg == TXG_INITIAL || !spa_writeable(spa)) {
+		fnvlist_free(nvl);
 		return;
+	}
 
 	va_copy(adx2, adx);