Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device

This commit is contained in:
Brian Behlendorf 2010-08-06 10:54:34 -07:00
parent 6ef06e035a 9e3e35dc3f
commit b1917e6208
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/zfs/zfs_ioctl.c
View File

@ -1632,9 +1632,10 @@ zfs_ioc_objset_stats(struct file *filp, 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);
}
error = put_nvlist(zc, nv);
if (error == 0)
error = put_nvlist(zc, nv);
nvlist_free(nv);
}