From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 18 Feb 2009 22:03:22 +0000 (-0800)
Subject: Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
X-Git-Tag: zfs-0.4.4~12^2~48^2~2^2^2~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5be9e325a13081ae88903581052340d784cc6441;p=zfs

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

Conflicts:

	module/zfs/arc.c
---

5be9e325a13081ae88903581052340d784cc6441
diff --cc module/zfs/arc.c
index da829ba56,3a9598a92..444ca863d
--- a/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);