diff options
| author | delphij <delphij@FreeBSD.org> | 2013-12-24 06:56:17 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-12-24 06:56:17 +0000 |
| commit | b045f69bf5e7c07b6a9c7c9c8bc9b5cfa820dbfe (patch) | |
| tree | 814a7451840a5183dbce47f16d08f35fabc74b83 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | |
| parent | b6353d1b7f920ec2565f25b59223aec81ef092af (diff) | |
| download | FreeBSD-src-b045f69bf5e7c07b6a9c7c9c8bc9b5cfa820dbfe.zip FreeBSD-src-b045f69bf5e7c07b6a9c7c9c8bc9b5cfa820dbfe.tar.gz | |
MFV r258373:
4168 ztest assertion failure in dbuf_undirty
4169 verbatim import causes zdb to segfa
4170 zhack leaves pool in ACTIVE state
illumos/illumos-gate@7fdd916c474ea52896c671bbe7b56ba34a1ca132
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index fb8101b..6b51705 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -4103,8 +4103,6 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) spa_config_sync(spa, B_FALSE, B_TRUE); mutex_exit(&spa_namespace_lock); - spa_history_log_version(spa, "import"); - return (0); } |
