Merge commit 'refs/top-bases/fix-branch' into fix-branch

This commit is contained in:
Brian Behlendorf 2010-08-06 10:47:03 -07:00
commit 86b29c0b9c
1 changed files with 3 additions and 2 deletions

View File

@ -1611,8 +1611,9 @@ zfs_ioc_objset_stats(zfs_cmd_t *zc)
*/
if (!zc->zc_objset_stats.dds_inconsistent) {
if (dmu_objset_type(os) == DMU_OST_ZVOL)
VERIFY(zvol_get_stats(os, nv) == 0);
error = zvol_get_stats(os, nv);
}
if (error == 0)
error = put_nvlist(zc, nv);
nvlist_free(nv);
}