diff options
| author | mav <mav@FreeBSD.org> | 2015-10-03 07:19:12 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-03 07:19:12 +0000 |
| commit | b683cc402c0daf7723c6b556eaef3c831a2cc726 (patch) | |
| tree | b610082089b6e7da8f1da4c1fdac493cdcf43f50 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c | |
| parent | 80738686dc670559c7c316973dc0e60a1feb5b0e (diff) | |
| download | FreeBSD-src-b683cc402c0daf7723c6b556eaef3c831a2cc726.zip FreeBSD-src-b683cc402c0daf7723c6b556eaef3c831a2cc726.tar.gz | |
MFC r286539:
5562 ZFS sa_handle's violate kmem invariants, debug kernels panic on boot
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Robert Mustacchi <rm@fingolfin.org>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Rich Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Justin T. Gibbs <justing@spectralogic.com>
illumos/illumos-gate@0fda3cc5c1c5a1d9bdea6d52637bef6e781549c9
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c index e40361e..0302647 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c @@ -210,12 +210,6 @@ sa_cache_constructor(void *buf, void *unused, int kmflag) { sa_handle_t *hdl = buf; - hdl->sa_bonus_tab = NULL; - hdl->sa_spill_tab = NULL; - hdl->sa_os = NULL; - hdl->sa_userp = NULL; - hdl->sa_bonus = NULL; - hdl->sa_spill = NULL; mutex_init(&hdl->sa_lock, NULL, MUTEX_DEFAULT, NULL); return (0); } @@ -1350,14 +1344,11 @@ sa_handle_destroy(sa_handle_t *hdl) (void) dmu_buf_update_user((dmu_buf_t *)hdl->sa_bonus, hdl, NULL, NULL); - if (hdl->sa_bonus_tab) { + if (hdl->sa_bonus_tab) sa_idx_tab_rele(hdl->sa_os, hdl->sa_bonus_tab); - hdl->sa_bonus_tab = NULL; - } - if (hdl->sa_spill_tab) { + + if (hdl->sa_spill_tab) sa_idx_tab_rele(hdl->sa_os, hdl->sa_spill_tab); - hdl->sa_spill_tab = NULL; - } dmu_buf_rele(hdl->sa_bonus, NULL); @@ -1392,6 +1383,8 @@ sa_handle_get_from_db(objset_t *os, dmu_buf_t *db, void *userp, handle->sa_bonus = db; handle->sa_os = os; handle->sa_spill = NULL; + handle->sa_bonus_tab = NULL; + handle->sa_spill_tab = NULL; error = sa_build_index(handle, SA_BONUS); newhandle = (hdl_type == SA_HDL_SHARED) ? |
