diff options
| author | avg <avg@FreeBSD.org> | 2012-11-24 13:14:53 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-11-24 13:14:53 +0000 |
| commit | 3b9e3d08850b51f4ccd48ad7bf3e63ab28fdaf27 (patch) | |
| tree | 89872717015847b38f1ff5f31fd085ca2a14b6ab /sys/cddl/contrib | |
| parent | 9c2d52ecdeada4a95b085a934ffcfb6123bfea18 (diff) | |
| download | FreeBSD-src-3b9e3d08850b51f4ccd48ad7bf3e63ab28fdaf27.zip FreeBSD-src-3b9e3d08850b51f4ccd48ad7bf3e63ab28fdaf27.tar.gz | |
spa_import_rootpool: do not call spa_history_log_version
The call is a NOP, because pool version in spa_ubsync.ub_version is not
initialized and thus appears to be zero.
If the version is properly set then the call leads to a NULL pointer
dereference because the spa object is still under-constructed.
The same change was independently made in the upstream as a part of
a larger change (4445fffbbb1ea25fd0e9ea68b9380dd7a6709025).
MFC after: 6 days
Diffstat (limited to 'sys/cddl/contrib')
| -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 94b25d4..8eb79b3 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -3865,8 +3865,6 @@ spa_import_rootpool(const char *name) return (error); } - spa_history_log_version(spa, LOG_POOL_IMPORT); - spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER); vdev_free(rvd); spa_config_exit(spa, SCL_ALL, FTAG); |
