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

Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
	module/zfs/arc.c

diff --cc cmd/zfs/zfs_main.c
Simple merge

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

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

diff --cc lib/libzfs/libzfs_dataset.c
index b57d120315e30ed9c3d51cc7ea681ec732a3866b,a3f5a7d0fc6d702f34d32d06286d885ffefd30a3..bf9b38813faf0b3a4c83d0662a56d3a0cc5eae81
--- 1/lib/libzfs/libzfs_dataset.c
--- 2/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -2581,11 -2754,10 +2754,10 @@@ in
  zfs_create_ancestors(libzfs_handle_t *hdl, const char *path)
  {
        int prefix;
-       uint64_t zoned;
        char *path_copy;
 -      int rc;
 +      int rc = 0;
  
-       if (check_parents(hdl, path, &zoned, B_TRUE, &prefix) != 0)
+       if (check_parents(hdl, path, NULL, B_TRUE, &prefix) != 0)
                return (-1);
  
        if ((path_copy = strdup(path)) != NULL) {

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

diff --cc lib/libzfs/libzfs_util.c
index 0dd5ed57db7491f71b921547fa0eec8c1a989f44,2e73f76ea5086b2ee28fbafcd6bd707f91270170..ad74d5617b4a73857167a06d9cec6eef5bdf5ada
--- 1/lib/libzfs/libzfs_util.c
--- 2/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@@ -908,10 -925,10 +925,10 @@@ zprop_print_headers(zprop_get_cbdata_t 
  void
  zprop_print_one_property(const char *name, zprop_get_cbdata_t *cbp,
      const char *propname, const char *value, zprop_source_t sourcetype,
-     const char *source)
+     const char *source, const char *recvd_value)
  {
        int i;
 -      const char *str;
 +      const char *str = NULL;
        char buf[128];
  
        /*

diff --cc module/nvpair/nvpair.c
Simple merge

diff --cc module/zfs/arc.c
index bfcb84451c89380b72202063f74edc5d10e3fdd7,8adb54dc6e195748d56578f3aa1e8eb213a42f86..eb380170551f0243647e1eacc4eeca7048061791
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -2957,10 -3026,15 +3026,15 @@@ arc_release(arc_buf_t *buf, void *tag
        arc_buf_hdr_t *hdr;
        kmutex_t *hash_lock = NULL;
        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);
+       /*
+        * It would be nice to assert that if it's DMU metadata (level >
+        * 0 || it's the dnode file), then it must be syncing context.
+        * But we don't know that information at this level.
+        */
+ 
+       mutex_enter(&buf->b_evict_lock);
        hdr = buf->b_hdr;
  
        /* this buffer is not on any list */

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

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

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

diff --cc module/zfs/lzjb.c
index 4132406bd66d90ea9a276143f06010755d348aa9,10952f472b333c8e2d208410bb4d6230c3a82e0a..192d2c38d2ccb6e0b0922db26044cfb6abcd88d2
--- 1/module/zfs/lzjb.c
--- 2/module/zfs/lzjb.c
+++ b/module/zfs/lzjb.c
@@@ -51,11 -51,11 +51,11 @@@ lzjb_compress(void *s_start, void *d_st
  {
        uchar_t *src = s_start;
        uchar_t *dst = d_start;
 -      uchar_t *cpy, *copymap;
 +      uchar_t *cpy, *copymap = NULL;
        int copymask = 1 << (NBBY - 1);
-       int mlen, offset;
+       int mlen, offset, hash;
        uint16_t *hp;
-       uint16_t lempel[LEMPEL_SIZE];   /* uninitialized; see above */
+       uint16_t lempel[LEMPEL_SIZE] = { 0 };
  
        while (src < (uchar_t *)s_start + s_len) {
                if ((copymask <<= 1) == (1 << NBBY)) {

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

diff --cc module/zfs/spa.c
index d4522a191339c548ffc737ffd971eae352238c34,d7c5de0d357a2fab7e3a281ed52196aab97519c8..2d0f0bfc43994cf553aef961838777300f7579d5
--- 1/module/zfs/spa.c
--- 2/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -3186,8 -3839,9 +3839,9 @@@ spa_vdev_detach(spa_t *spa, uint64_t gu
        vdev_t *rvd = spa->spa_root_vdev;
        vdev_t *vd, *pvd, *cvd, *tvd;
        boolean_t unspare = B_FALSE;
 -      uint64_t unspare_guid;
 +      uint64_t unspare_guid = 0;
        size_t len;
+       char *vdpath;
  
        txg = spa_vdev_enter(spa);
  

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

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

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