diff options
| author | mav <mav@FreeBSD.org> | 2015-10-03 11:19:32 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-03 11:19:32 +0000 |
| commit | f2f72b8384bc06040b3de4dad8a54d4d8ac3c510 (patch) | |
| tree | 7664c6f4fb6d97ed98f34df8650c20492667b841 /sys/cddl/contrib | |
| parent | ff0cc52beded8983b3730cbd22e2aab586a2ee4d (diff) | |
| download | FreeBSD-src-f2f72b8384bc06040b3de4dad8a54d4d8ac3c510.zip FreeBSD-src-f2f72b8384bc06040b3de4dad8a54d4d8ac3c510.tar.gz | |
MFC r286983 (by avg):
fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)
Diffstat (limited to 'sys/cddl/contrib')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c index dfdb38c..90355a9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c @@ -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; |
