From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 14 Jun 2010 22:51:50 +0000 (-0700)
Subject: Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~29^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fa2cb516bd20483606ee626e4e40ad6336ea173;p=zfs

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

5fa2cb516bd20483606ee626e4e40ad6336ea173
diff --cc lib/libzfs/libzfs_dataset.c
index 5cf87ab0b,64ec910da..af61f565f
--- a/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -3323,10 -3310,10 +3323,10 @@@ zfs_rollback(zfs_handle_t *zhp, zfs_han
  {
  	rollback_data_t cb = { 0 };
  	int err;
- 	zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
+ 	zfs_cmd_t zc = { "\0", "\0", "\0", "\0", 0 };
  	boolean_t restore_resv = 0;
 -	uint64_t old_volsize, new_volsize;
 -	zfs_prop_t resv_prop;
 +	uint64_t old_volsize = 0, new_volsize;
 +	zfs_prop_t resv_prop = { 0 };
  
  	assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
  	    zhp->zfs_type == ZFS_TYPE_VOLUME);