svn commit: r286539 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sun Aug  9 19:17:59 2015
New Revision: 286539
URL: https://svnweb.freebsd.org/changeset/base/286539

Log:
  MFV 286538:
  5562 ZFS sa_handle's violate kmem invariants, debug kernels panic on boot
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Robert Mustacchi <rm at fingolfin.org>
  Reviewed by: George Wilson <george at delphix.com>
  Reviewed by: Rich Lowe <richlowe at richlowe.net>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Justin T. Gibbs <justing at spectralogic.com>
  
  illumos/illumos-gate at 0fda3cc5c1c5a1d9bdea6d52637bef6e781549c9

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Sun Aug  9 19:12:43 2015	(r286538)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Sun Aug  9 19:17:59 2015	(r286539)
@@ -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) ?