Note r286552 as merged and reduce diff against upstream.

This commit is contained in:
Xin LI 2015-09-13 06:49:42 +00:00
commit 011ecb128f

View File

@ -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);