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

Conflicts:

	module/zfs/arc.c
	module/zfs/zio.c

diff --cc module/zfs/arc.c
Simple merge

diff --cc module/zfs/dbuf.c
Simple merge

diff --cc module/zfs/dmu.c
Simple merge

diff --cc module/zfs/dmu_objset.c
Simple merge

diff --cc module/zfs/dnode.c
Simple merge

diff --cc module/zfs/dnode_sync.c
Simple merge

diff --cc module/zfs/dsl_dataset.c
Simple merge

diff --cc module/zfs/dsl_dir.c
Simple merge

diff --cc module/zfs/dsl_prop.c
Simple merge

diff --cc module/zfs/spa.c
index 43c9a19e854dd4d0818e3ae2c8bb6925bef885f7,6a95b399bfe6e70af12456ee7011ef99dc4c3980..524c6f66b2f2edf9abca041905a6dfb7194b8445
--- 1/module/zfs/spa.c
--- 2/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -3017,15 -3116,9 +3115,9 @@@ spa_vdev_attach(spa_t *spa, uint64_t gu
        newvd->vdev_id = pvd->vdev_children;
        vdev_add_child(pvd, newvd);
  
-       /*
-        * If newvd is smaller than oldvd, but larger than its rsize,
-        * the addition of newvd may have decreased our parent's asize.
-        */
-       pvd->vdev_asize = MIN(pvd->vdev_asize, newvd->vdev_asize);
- 
        tvd = newvd->vdev_top;
        ASSERT(pvd->vdev_top == tvd);
 -      ASSERT(tvd->vdev_parent == rvd);
 +      ASSERT(tvd->vdev_parent == spa->spa_root_vdev);
  
        vdev_config_dirty(tvd);
  

diff --cc module/zfs/vdev.c
Simple merge

diff --cc module/zfs/zap_micro.c
Simple merge