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

Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/spa.c

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc cmd/zfs/zfs_main.c
index cf30df7d82bf7723d4193fc1398ed6445a84f31d,0752a4772e5c6077792d4e0fd9dbc2428f542061..f28318ff5a65ffeaaeda36ad8221e04baf88fcbe
--- 1/cmd/zfs/zfs_main.c
--- 2/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@@ -4208,8 -3990,8 +3990,9 @@@ main(int argc, char **argv
                        (void) fprintf(stderr, gettext("unrecognized "
                            "command '%s'\n"), cmdname);
                        usage(B_FALSE);
 +                      ret = 1;
                }
+               libzfs_mnttab_cache(g_zfs, B_FALSE);
        }
  
        (void) fclose(mnttab_file);

diff --cc cmd/zpool/zpool_main.c
Simple merge

diff --cc cmd/ztest/ztest.c
Simple merge

diff --cc lib/libzfs/libzfs_dataset.c
Simple merge

diff --cc lib/libzfs/libzfs_util.c
Simple merge

diff --cc module/zfs/arc.c
index c46a5aeddf365ce08a5695d800e42a0a0569ce2b,d5e5aa544bfd09112f53a37e694208a1b9eb70cd..c7385cff230d77f105c2dd114552bc4892de2308
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -2922,7 -2957,8 +2957,8 @@@ arc_release(arc_buf_t *buf, void *tag
        arc_buf_hdr_t *hdr;
        kmutex_t *hash_lock;
        l2arc_buf_hdr_t *l2hdr;
 -      uint64_t buf_size;
 +      uint64_t buf_size = 0;
+       boolean_t released = B_FALSE;
  
        rw_enter(&buf->b_lock, RW_WRITER);
        hdr = buf->b_hdr;

diff --cc module/zfs/dmu.c
index 1f49284370ace77d519bb45072d50e6156640f37,785c7c621611e69dd8e40d97c302f0de0b42018f..71c2dcc6fdd3920a80d3fdccba8cd338e4e0ab1e
--- 1/module/zfs/dmu.c
--- 2/module/zfs/dmu.c
+++ b/module/zfs/dmu.c
@@@ -186,10 -188,10 +188,10 @@@ dmu_buf_hold_array_by_dnode(dnode_t *dn
        dsl_pool_t *dp = NULL;
        dmu_buf_t **dbp;
        uint64_t blkid, nblks, i;
-       uint32_t flags;
+       uint32_t dbuf_flags;
        int err;
        zio_t *zio;
 -      hrtime_t start;
 +      hrtime_t start = 0;
  
        ASSERT(length <= DMU_MAX_ACCESS);
  

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

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

diff --cc module/zfs/spa.c
index 8137043d926510fdf418994c18a68bd0ca8bdd65,6a95b399bfe6e70af12456ee7011ef99dc4c3980..1e1104f57ce8f9e887226fe032ee0e866d1cad26
--- 1/module/zfs/spa.c
--- 2/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -869,8 -941,8 +941,8 @@@ spa_load_l2cache(spa_t *spa
        nvlist_t **l2cache;
        uint_t nl2cache;
        int i, j, oldnvdevs;
-       uint64_t guid, size;
+       uint64_t guid;
 -      vdev_t *vd, **oldvdevs, **newvdevs;
 +      vdev_t *vd, **oldvdevs, **newvdevs = NULL;
        spa_aux_vdev_t *sav = &spa->spa_l2cache;
  
        ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);

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

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

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

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