Note r286552 as merged and reduce diff against upstream.

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 d2085bb2f2dfda11bdc75710d068cb94f24c887a..47e2f203f4ccf17c035d02a2babd906342982ea2 100644 (file)
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
@@ -1633,6 +1633,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);