From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 3 Jul 2009 00:07:52 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
X-Git-Tag: zfs-0.4.5~59^2^2^2^2~2^2~2^2^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=480b03791d76dead9c1526b2d88b57992b3211c8;p=zfs

Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:

	lib/libzfs/libzfs_dataset.c
---

480b03791d76dead9c1526b2d88b57992b3211c8
diff --cc cmd/zdb/zdb.c
index f75e7a838,a310fc38b..b9f48b146
--- a/cmd/zdb/zdb.c
+++ b/cmd/zdb/zdb.c
@@@ -1571,11 -1627,10 +1628,12 @@@ dump_block_stats(spa_t *spa
  	int leaks = 0;
  	int c, e;
  
 +	bzero(&zcb, sizeof(zdb_cb_t));
 +
  	if (!dump_opt['S']) {
- 		(void) printf("\nTraversing all blocks %s%s%s%s...\n",
+ 		(void) printf("\nTraversing all blocks %s%s%s%s%s...\n",
  		    (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
+ 		    (dump_opt['c'] == 1) ? "metadata " : "",
  		    dump_opt['c'] ? "checksums " : "",
  		    (dump_opt['c'] && !dump_opt['L']) ? "and verify " : "",
  		    !dump_opt['L'] ? "nothing leaked " : "");
diff --cc cmd/ztest/ztest.c
index f5cf6311f,746db0c07..6ef999f93
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@@ -1935,8 -2549,9 +2549,10 @@@ ztest_dmu_write_parallel(ztest_args_t *
  	uint64_t blkoff;
  	zbookmark_t zb;
  	dmu_tx_t *tx = dmu_tx_create(os);
+ 	dmu_buf_t *bonus_db;
+ 	arc_buf_t *abuf = NULL;
  
 +	bzero(&blk, sizeof(blkptr_t));
  	dmu_objset_name(os, osname);
  
  	/*
diff --cc lib/libzfs/libzfs_dataset.c
index 15e279bb0,ac9122605..09c646dad
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -4424,9 -3925,10 +3925,10 @@@ zfs_iscsi_perm_check(libzfs_handle_t *h
  
  int
  zfs_deleg_share_nfs(libzfs_handle_t *hdl, char *dataset, char *path,
-     void *export, void *sharetab, int sharemax, zfs_share_op_t operation)
+     char *resource, void *export, void *sharetab,
+     int sharemax, zfs_share_op_t operation)
  {
 -	zfs_cmd_t zc = { 0 };
 +	zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
  	int error;
  
  	(void) strlcpy(zc.zc_name, dataset, sizeof (zc.zc_name));
diff --cc lib/libzfs/libzfs_pool.c
index 6de2452b2,fd734d8b4..9877a2985
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@@ -1614,14 -1795,19 +1795,19 @@@ in
  zpool_vdev_online(zpool_handle_t *zhp, const char *path, int flags,
      vdev_state_t *newstate)
  {
 -	zfs_cmd_t zc = { 0 };
 +	zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
  	char msg[1024];
  	nvlist_t *tgt;
- 	boolean_t avail_spare, l2cache;
+ 	boolean_t avail_spare, l2cache, islog;
  	libzfs_handle_t *hdl = zhp->zpool_hdl;
  
- 	(void) snprintf(msg, sizeof (msg),
- 	    dgettext(TEXT_DOMAIN, "cannot online %s"), path);
+ 	if (flags & ZFS_ONLINE_EXPAND) {
+ 		(void) snprintf(msg, sizeof (msg),
+ 		    dgettext(TEXT_DOMAIN, "cannot expand %s"), path);
+ 	} else {
+ 		(void) snprintf(msg, sizeof (msg),
+ 		    dgettext(TEXT_DOMAIN, "cannot online %s"), path);
+ 	}
  
  	(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
  	if ((tgt = zpool_find_vdev(zhp, path, &avail_spare, &l2cache,