diff options
| author | mm <mm@FreeBSD.org> | 2013-03-17 18:49:11 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-17 18:49:11 +0000 |
| commit | 71bf489e1dedab6b58142f0d7e5b523b8685ab9a (patch) | |
| tree | 6e02ff5591698a3ce18b42da8c02e4b619aab48b | |
| parent | 3d2567990a126eeb3af2fca1367c9749e6bb945f (diff) | |
| download | FreeBSD-src-71bf489e1dedab6b58142f0d7e5b523b8685ab9a.zip FreeBSD-src-71bf489e1dedab6b58142f0d7e5b523b8685ab9a.tar.gz | |
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
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c index 15d3050..0fe5f71 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c @@ -444,8 +444,10 @@ log_internal(nvlist_t *nvl, const char *operation, spa_t *spa, * 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); |
