From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 22:07:36 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d60fc5ca30ea214fc6a67d6e68dbe25f57d0a7a5;p=zfs

Merge commit 'refs/top-bases/gcc-unused' into gcc-unused

Conflicts:
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_prop.c
	module/zfs/metaslab.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
---

d60fc5ca30ea214fc6a67d6e68dbe25f57d0a7a5
diff --cc module/zfs/dbuf.c
index 86a6287f3,42ae43997..273bae9c6
--- a/module/zfs/dbuf.c
+++ b/module/zfs/dbuf.c
@@@ -333,12 -341,12 +341,13 @@@ dbuf_verify(dmu_buf_impl_t *db
  				ASSERT(db->db_parent == NULL);
  			else
  				ASSERT(db->db_parent != NULL);
- 			ASSERT3P(db->db_blkptr, ==,
- 			    &dn->dn_phys->dn_blkptr[db->db_blkid]);
+ 			if (db->db_blkid != DMU_SPILL_BLKID)
+ 				ASSERT3P(db->db_blkptr, ==,
+ 				    &dn->dn_phys->dn_blkptr[db->db_blkid]);
  		} else {
  			/* db is pointed to by an indirect block */
 -			int epb = db->db_parent->db.db_size >> SPA_BLKPTRSHIFT;
 +			ASSERTV(int epb = db->db_parent->db.db_size >>
 +				SPA_BLKPTRSHIFT);
  			ASSERT3U(db->db_parent->db_level, ==, db->db_level+1);
  			ASSERT3U(db->db_parent->db.db_object, ==,
  			    db->db.db_object);
diff --cc module/zfs/dmu_objset.c
index 8aad15bd7,690e6ecde..3aea0f321
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@@ -888,12 -949,11 +949,12 @@@ dmu_objset_sync_dnodes(list_t *list, li
  
  /* ARGSUSED */
  static void
- ready(zio_t *zio, arc_buf_t *abuf, void *arg)
+ dmu_objset_write_ready(zio_t *zio, arc_buf_t *abuf, void *arg)
  {
  	blkptr_t *bp = zio->io_bp;
- 	objset_impl_t *os = arg;
+ 	objset_t *os = arg;
  	dnode_phys_t *dnp = &os->os_phys->os_meta_dnode;
 +	ASSERTV(blkptr_t *bp_orig = &zio->io_bp_orig);
  
  	ASSERT(bp == os->os_rootbp);
  	ASSERT(BP_GET_TYPE(bp) == DMU_OT_OBJSET);
diff --cc module/zfs/dnode_sync.c
index 383eac854,f9ec9f602..afad0f576
--- a/module/zfs/dnode_sync.c
+++ b/module/zfs/dnode_sync.c
@@@ -512,7 -511,8 +511,8 @@@ dnode_sync(dnode_t *dn, dmu_tx_t *tx
  	dnode_phys_t *dnp = dn->dn_phys;
  	int txgoff = tx->tx_txg & TXG_MASK;
  	list_t *list = &dn->dn_dirty_records[txgoff];
 -	static const dnode_phys_t zerodn = { 0 };
+ 	boolean_t kill_spill = B_FALSE;
 +	ASSERTV(static const dnode_phys_t zerodn = { 0 });
  
  	ASSERT(dmu_tx_is_syncing(tx));
  	ASSERT(dnp->dn_type != DMU_OT_NONE || dn->dn_allocated_txg);
diff --cc module/zfs/dsl_dataset.c
index 45ddfd8f3,ddd83576c..53413ef19
--- a/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
@@@ -1097,9 -1094,9 +1094,8 @@@ dsl_dataset_destroy(dsl_dataset_t *ds, 
  	 * context, the user space accounting should be zero.
  	 */
  	if (ds->ds_phys->ds_bp.blk_fill == 0 &&
- 	    dmu_objset_userused_enabled(os->os)) {
+ 	    dmu_objset_userused_enabled(os)) {
 -		uint64_t count;
 -
 +		ASSERTV(uint64_t count);
- 
  		ASSERT(zap_count(os, DMU_USERUSED_OBJECT, &count) != 0 ||
  		    count == 0);
  		ASSERT(zap_count(os, DMU_GROUPUSED_OBJECT, &count) != 0 ||
@@@ -1959,11 -1883,11 +1882,11 @@@ dsl_dataset_destroy_sync(void *arg1, vo
  		dsl_dataset_rele(ds_prev, FTAG);
  
  	spa_prop_clear_bootfs(dp->dp_spa, ds->ds_object, tx);
- 	spa_history_internal_log(LOG_DS_DESTROY, dp->dp_spa, tx,
- 	    cr, "dataset = %llu", ds->ds_object);
+ 	spa_history_log_internal(LOG_DS_DESTROY, dp->dp_spa, tx,
+ 	    "dataset = %llu", ds->ds_object);
  
  	if (ds->ds_phys->ds_next_clones_obj != 0) {
 -		uint64_t count;
 +		ASSERTV(uint64_t count);
  		ASSERT(0 == zap_count(mos,
  		    ds->ds_phys->ds_next_clones_obj, &count) && count == 0);
  		VERIFY(0 == dmu_object_free(mos,
diff --cc module/zfs/spa.c
index d45e070ea,d7c5de0d3..4243c4842
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -2997,8 -3645,8 +3645,8 @@@ spa_vdev_add(spa_t *spa, nvlist_t *nvro
  int
  spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
  {
- 	uint64_t txg, open_txg;
+ 	uint64_t txg, dtl_max_txg;
 -	vdev_t *rvd = spa->spa_root_vdev;
 +	ASSERTV(vdev_t *rvd = spa->spa_root_vdev;)
  	vdev_t *oldvd, *newvd, *newrootvd, *pvd, *tvd;
  	vdev_ops_t *pvops;
  	char *oldvdpath, *newvdpath;
diff --cc module/zfs/vdev.c
index 2189297c6,a61f29b8e..ad88f8371
--- a/module/zfs/vdev.c
+++ b/module/zfs/vdev.c
@@@ -1274,7 -1401,8 +1401,8 @@@ vdev_validate(vdev_t *vd
  void
  vdev_close(vdev_t *vd)
  {
 -	spa_t *spa = vd->vdev_spa;
 +	ASSERTV(spa_t *spa = vd->vdev_spa);
+ 	vdev_t *pvd = vd->vdev_parent;
  
  	ASSERT(spa_config_held(spa, SCL_STATE_ALL, RW_WRITER) == SCL_STATE_ALL);
  
diff --cc module/zfs/zap_micro.c
index 7a6b1e883,2d89c20c4..52a7e4f57
--- a/module/zfs/zap_micro.c
+++ b/module/zfs/zap_micro.c
@@@ -747,8 -937,8 +937,8 @@@ mzap_addent(zap_name_t *zn, uint64_t va
  
  #ifdef ZFS_DEBUG
  	for (i = 0; i < zap->zap_m.zap_num_chunks; i++) {
 -		mzap_ent_phys_t *mze = &zap->zap_m.zap_phys->mz_chunk[i];
 +		ASSERTV(mzap_ent_phys_t *mze=&zap->zap_m.zap_phys->mz_chunk[i]);
- 		ASSERT(strcmp(zn->zn_name_orij, mze->mze_name) != 0);
+ 		ASSERT(strcmp(zn->zn_key_orig, mze->mze_name) != 0);
  	}
  #endif