Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
Conflicts: module/zfs/dbuf.c module/zfs/dsl_dataset.c
This commit is contained in:
commit
ffaa677995
|
@ -332,7 +332,7 @@ dbuf_verify(dmu_buf_impl_t *db)
|
|||
* dnode_set_blksz().
|
||||
*/
|
||||
if (db->db_level == 0 && db->db.db_object == DMU_META_DNODE_OBJECT) {
|
||||
ASSERTV(dbuf_dirty_record_t *dr = db->db_data_pending);
|
||||
dr = db->db_data_pending;
|
||||
/*
|
||||
* It should only be modified in syncing context, so
|
||||
* make sure we only have one copy of the data.
|
||||
|
|
|
@ -1098,7 +1098,6 @@ dsl_dataset_destroy(dsl_dataset_t *ds, void *tag, boolean_t defer)
|
|||
if (ds->ds_phys->ds_bp.blk_fill == 0 &&
|
||||
dmu_objset_userused_enabled(os)) {
|
||||
ASSERTV(uint64_t count);
|
||||
|
||||
ASSERT(zap_count(os, DMU_USERUSED_OBJECT, &count) != 0 ||
|
||||
count == 0);
|
||||
ASSERT(zap_count(os, DMU_GROUPUSED_OBJECT, &count) != 0 ||
|
||||
|
|
Loading…
Reference in New Issue