From 46c4461443d750bb0a2dffc8e886169a14c4c6cf Mon Sep 17 00:00:00 2001 From: mav Date: Sat, 3 Oct 2015 11:39:39 +0000 Subject: MFC r287744 (by delphij): Reduce diff against upstream. --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/cddl') diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index 019aada..b57eb95 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -1630,6 +1630,7 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value) error = dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db); if (error != 0) return (error); + nvsize = *(uint64_t *)db->db_data; dmu_buf_rele(db, FTAG); -- cgit v1.1