Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
This commit is contained in:
commit
cfc42cf0ab
|
@ -962,11 +962,11 @@ dmu_objset_fsid_guid(objset_t *os)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *stat)
|
dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *st)
|
||||||
{
|
{
|
||||||
stat->dds_type = os->os->os_phys->os_type;
|
st->dds_type = os->os->os_phys->os_type;
|
||||||
if (os->os->os_dsl_dataset)
|
if (os->os->os_dsl_dataset)
|
||||||
dsl_dataset_fast_stat(os->os->os_dsl_dataset, stat);
|
dsl_dataset_fast_stat(os->os->os_dsl_dataset, st);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue