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

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc lib/libzfs/libzfs_dataset.c
index 5cf87ab0b11cbf9a8b38ce25d03eecb24cdc3a51,64ec910dac74afaca3b09fe0a56839ccd62e60cd..af61f565f1a668c374f8c0c292711ce4dca43683
--- 1/lib/libzfs/libzfs_dataset.c
--- 2/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);

diff --cc lib/libzfs/libzfs_import.c
Simple merge

diff --cc lib/libzfs/libzfs_pool.c
Simple merge

diff --cc lib/libzfs/libzfs_sendrecv.c
Simple merge

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