Mercurial > illumos > illumos-gate
changeset 10002:2a588c9bb482
6801926 assertion failed: zvol_get_stats(os, nv) == 0, ...
| author | Eric Taylor <Eric.Taylor@Sun.COM> |
|---|---|
| date | Tue, 30 Jun 2009 09:46:41 -0600 |
| parents | d540bbbe2461 |
| children | f07f995d4507 |
| files | usr/src/uts/common/fs/zfs/dsl_dataset.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c Tue Jun 30 08:31:17 2009 -0700 +++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c Tue Jun 30 09:46:41 2009 -0600 @@ -1211,7 +1211,8 @@ /* * We can only roll back to emptyness if it is a ZPL objset. */ - if (*ost != DMU_OST_ZFS && ds->ds_phys->ds_prev_snap_txg == 0) + if (*ost != DMU_OST_ZFS && + ds->ds_phys->ds_prev_snap_txg < TXG_INITIAL) return (EINVAL); /* @@ -1316,6 +1317,7 @@ } else { objset_impl_t *osi; + ASSERT(*ost != DMU_OST_ZVOL); ASSERT3U(ds->ds_phys->ds_used_bytes, ==, 0); ASSERT3U(ds->ds_phys->ds_compressed_bytes, ==, 0); ASSERT3U(ds->ds_phys->ds_uncompressed_bytes, ==, 0);