svn commit: r288589 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Oct  3 11:19:32 2015
New Revision: 288589
URL: https://svnweb.freebsd.org/changeset/base/288589

Log:
  MFC r286983 (by avg):
  fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)

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 11:18:30 2015	(r288588)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c	Sat Oct  3 11:19:32 2015	(r288589)
@@ -220,7 +220,6 @@ static void
 sa_cache_destructor(void *buf, void *unused)
 {
 	sa_handle_t *hdl = buf;
-	hdl->sa_dbu.dbu_evict_func = NULL;
 	mutex_destroy(&hdl->sa_lock);
 }
 
@@ -1385,6 +1384,7 @@ sa_handle_get_from_db(objset_t *os, dmu_
 		sa_handle_t *winner = NULL;
 
 		handle = kmem_cache_alloc(sa_cache, KM_SLEEP);
+		handle->sa_dbu.dbu_evict_func = NULL;
 		handle->sa_userp = userp;
 		handle->sa_bonus = db;
 		handle->sa_os = os;