diff options
| author | mav <mav@FreeBSD.org> | 2015-10-03 11:39:39 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-03 11:39:39 +0000 |
| commit | 46c4461443d750bb0a2dffc8e886169a14c4c6cf (patch) | |
| tree | c9e1b7078f93b2b23efe3e14e5f34abcae50cadd /sys/cddl | |
| parent | c9b8e5282d13630465263290bb08637ffb58da50 (diff) | |
| download | FreeBSD-src-46c4461443d750bb0a2dffc8e886169a14c4c6cf.zip FreeBSD-src-46c4461443d750bb0a2dffc8e886169a14c4c6cf.tar.gz | |
MFC r287744 (by delphij): Reduce diff against upstream.
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |
