diff options
| author | delphij <delphij@FreeBSD.org> | 2015-09-13 06:49:42 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-09-13 06:49:42 +0000 |
| commit | 31873285308b42fa06c94bb70d194ef5120cb57e (patch) | |
| tree | 3fb4b27123db6c2337e8205d048649ca6035d41b /sys/cddl | |
| parent | cf5110cc514a3e940d5a99ad88381f7e6d029ef1 (diff) | |
| download | FreeBSD-src-31873285308b42fa06c94bb70d194ef5120cb57e.zip FreeBSD-src-31873285308b42fa06c94bb70d194ef5120cb57e.tar.gz | |
Note r286552 as merged and 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 d2085bb..47e2f20 100644 --- 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); |
