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

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

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

diff --cc lib/libzfs/libzfs_dataset.c
index 91435530f95bfa09db69229b83ccbc09c1f61728,ab9ba6b80143bfb3336ec6f98ab7f96531a7c957..75a11ec252ac275c565cf362fd4d3384d715bbfa
--- 1/lib/libzfs/libzfs_dataset.c
--- 2/lib/libzfs/libzfs_dataset.c
+++ b/lib/libzfs/libzfs_dataset.c
@@@ -2763,9 -2766,9 +2766,9 @@@ zfs_create(libzfs_handle_t *hdl, const 
   * isn't mounted, and that there are no active dependents.
   */
  int
- zfs_destroy(zfs_handle_t *zhp)
+ zfs_destroy(zfs_handle_t *zhp, boolean_t defer)
  {
 -      zfs_cmd_t zc = { 0 };
 +      zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
  
        (void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
  
@@@ -2843,9 -2847,9 +2847,9 @@@ zfs_remove_link_cb(zfs_handle_t *zhp, v
   * Destroys all snapshots with the given name in zhp & descendants.
   */
  int
- zfs_destroy_snaps(zfs_handle_t *zhp, char *snapname)
+ zfs_destroy_snaps(zfs_handle_t *zhp, char *snapname, boolean_t defer)
  {
 -      zfs_cmd_t zc = { 0 };
 +      zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
        int ret;
        struct destroydata dd = { 0 };
  

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

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