Author: avg
Date: Fri Aug 21 08:04:56 2015
New Revision: 286983
URL: https://svnweb.freebsd.org/changeset/base/286983
Log:
fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)
PR: 202358
X-MFC with: r286539
X-MFC attn: mav
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 Fri Aug 21
07:09:53 2015 (r286982)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c Fri Aug 21
08:04:56 2015 (r286983)
@@ -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;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
