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

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:
Brian Behlendorf 2010-05-28 15:38:43 -07:00
parent 408ad63b2f d60fc5ca30
commit ffaa677995
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/dbuf.c
View File

@ -332,7 +332,7 @@ dbuf_verify(dmu_buf_impl_t *db)
* dnode_set_blksz(). * dnode_set_blksz().
*/ */
if (db->db_level == 0 && db->db.db_object == DMU_META_DNODE_OBJECT) { 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 * It should only be modified in syncing context, so
* make sure we only have one copy of the data. * make sure we only have one copy of the data.

1
module/zfs/dsl_dataset.c
View File

@ -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 && if (ds->ds_phys->ds_bp.blk_fill == 0 &&
dmu_objset_userused_enabled(os)) { dmu_objset_userused_enabled(os)) {
ASSERTV(uint64_t count); ASSERTV(uint64_t count);
ASSERT(zap_count(os, DMU_USERUSED_OBJECT, &count) != 0 || ASSERT(zap_count(os, DMU_USERUSED_OBJECT, &count) != 0 ||
count == 0); count == 0);
ASSERT(zap_count(os, DMU_GROUPUSED_OBJECT, &count) != 0 || ASSERT(zap_count(os, DMU_GROUPUSED_OBJECT, &count) != 0 ||