diff options
| author | Brian Behlendorf <[email protected]> | 2009-01-15 14:04:35 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-01-15 14:04:35 -0800 |
| commit | 3fa768e21bb1c020b2545c4728b48c41e2d0f837 (patch) | |
| tree | 1c78a2b69ddc1b19fdeee2d2fa11359fb6c289c3 /module/zfs/dsl_dataset.c | |
| parent | 06b00a59510a1483189f66a18251c41afbac2cf6 (diff) | |
| parent | d3df6b20121622524d1d560740b8008ce2e0d8b8 (diff) | |
Resolve conflict with removed cleaner type
Diffstat (limited to 'module/zfs/dsl_dataset.c')
| -rw-r--r-- | module/zfs/dsl_dataset.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index 4f9083f17..c1e3e9425 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -1950,6 +1950,9 @@ dsl_dataset_fast_stat(dsl_dataset_t *ds, dmu_objset_stats_t *stat) if (ds->ds_phys->ds_next_snap_obj) { stat->dds_is_snapshot = B_TRUE; stat->dds_num_clones = ds->ds_phys->ds_num_children - 1; + } else { + stat->dds_is_snapshot = B_FALSE; + stat->dds_num_clones = 0; } /* clone origin is really a dsl_dir thing... */ @@ -1961,6 +1964,8 @@ dsl_dataset_fast_stat(dsl_dataset_t *ds, dmu_objset_stats_t *stat) ds->ds_dir->dd_phys->dd_origin_obj, FTAG, &ods)); dsl_dataset_name(ods, stat->dds_origin); dsl_dataset_drop_ref(ods, FTAG); + } else { + stat->dds_origin[0] = '\0'; } rw_exit(&ds->ds_dir->dd_pool->dp_config_rwlock); } |