From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 2 Jul 2009 23:57:09 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
X-Git-Tag: zfs-0.4.5~59^2^2^2^2~2^2~2^2^2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44703f00295c747dffeecd027d147e448644b110;p=zfs

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

Conflicts:

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

44703f00295c747dffeecd027d147e448644b110
diff --cc cmd/zfs/zfs_main.c
index cf30df7d8,0752a4772..f28318ff5
--- a/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 module/zfs/arc.c
index c46a5aedd,d5e5aa544..c7385cff2
--- a/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 1f4928437,785c7c621..71c2dcc6f
--- a/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/spa.c
index 8137043d9,6a95b399b..1e1104f57
--- a/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);