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

Conflicts:

	module/zfs/arc.c

diff --cc module/zfs/arc.c
index da829ba565dca6169bfb242f9cf2cfc3bf7e3f73,3a9598a926b248c7987d681e9d07f91e5fb75758..444ca863d9746031269d2ce3238983c219fb591a
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -2453,12 -2524,13 +2524,13 @@@ arc_read_nolock(zio_t *pio, spa_t *spa
      uint32_t *arc_flags, const zbookmark_t *zb)
  {
        arc_buf_hdr_t *hdr;
 -      arc_buf_t *buf;
 +      arc_buf_t *buf = NULL;
        kmutex_t *hash_lock;
        zio_t *rzio;
+       uint64_t guid = spa_guid(spa);
  
  top:
-       hdr = buf_hash_find(spa, BP_IDENTITY(bp), bp->blk_birth, &hash_lock);
+       hdr = buf_hash_find(guid, BP_IDENTITY(bp), bp->blk_birth, &hash_lock);
        if (hdr && hdr->b_datacnt > 0) {
  
                *arc_flags |= ARC_CACHED;
@@@ -4057,7 -4219,7 +4219,8 @@@ l2arc_write_buffers(spa_t *spa, l2arc_d
        boolean_t have_lock, full;
        l2arc_write_callback_t *cb;
        zio_t *pio, *wzio;
+       uint64_t guid = spa_guid(spa);
 +      int try;
  
        ASSERT(dev->l2ad_vdev != NULL);
  

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

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