From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 Aug 2009 19:08:46 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
X-Git-Tag: zfs-0.4.6~42^2^2^2^2^2^2~2^2^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41b297a27ff9344aebe0b7e496e41aab9974bfe0;p=zfs

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

41b297a27ff9344aebe0b7e496e41aab9974bfe0
diff --cc lib/libzfs/libzfs_dataset.c
index 91435530f,ab9ba6b80..75a11ec25
--- a/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 };