upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)

Browse source 
PR:		202358
X-MFC with:	r286539
X-MFC attn:	mav
This commit is contained in:
Andriy Gapon 2015-08-21 08:04:56 +00:00
parent 95c64defd7
commit b985dac5ff
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
View file

@ -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_buf_t *db, void *userp,
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;