Author: mav
Date: Sat Oct 3 07:19:12 2015
New Revision: 288537
URL: https://svnweb.freebsd.org/changeset/base/288537
Log:
MFC r286539:
5562 ZFS sa_handle's violate kmem invariants, debug kernels panic on boot
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Robert Mustacchi <r...@fingolfin.org>
Reviewed by: George Wilson <geo...@delphix.com>
Reviewed by: Rich Lowe <richl...@richlowe.net>
Approved by: Dan McDonald <dan...@omniti.com>
Author: Justin T. Gibbs <just...@spectralogic.com>
illumos/illumos-gate@0fda3cc5c1c5a1d9bdea6d52637bef6e781549c9
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c Sat Oct
3 07:17:45 2015 (r288536)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c Sat Oct
3 07:19:12 2015 (r288537)
@@ -210,12 +210,6 @@ sa_cache_constructor(void *buf, void *un
{
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_
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) ?
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
