diff options
| author | avg <avg@FreeBSD.org> | 2015-08-21 08:04:56 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2015-08-21 08:04:56 +0000 |
| commit | 0bba4c28eaadccecb18caf0b66026b027608cbf6 (patch) | |
| tree | d4144a90203f8151aba68fd9978df2f02143d0e0 /sys/cddl | |
| parent | 75130e0bf33fa6ddc5766900f6ea00360ae8aac5 (diff) | |
| download | FreeBSD-src-0bba4c28eaadccecb18caf0b66026b027608cbf6.zip FreeBSD-src-0bba4c28eaadccecb18caf0b66026b027608cbf6.tar.gz | |
fix a mismerge in r286539 (MFV 286538: 5562 ZFS sa_handle's violate...)
PR: 202358
X-MFC with: r286539
X-MFC attn: mav
Diffstat (limited to 'sys/cddl')
| -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; |
