svn commit: r275784 - vendor/illumos/dist/lib/libzfs/common

[Xin LI]

Author: delphij
Date: Mon Dec 15 08:02:22 2014
New Revision: 275784
URL: https://svnweb.freebsd.org/changeset/base/275784

Log:
  5427 memory leak in libzfs when doing rollback
  Reviewed by: Michael Tsymbalyuk <mtzaurus at gmail.com>
  Reviewed by: Steven Hartland <killing at multiplay.co.uk>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Jan Kryl <jan.kryl at nexenta.com>
  
  illumos/illumos-gate at b7070b7dbcc2758a7f87cefb69ad42887a287152

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c	Mon Dec 15 07:59:33 2014	(r275783)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c	Mon Dec 15 08:02:22 2014	(r275784)
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -186,9 +186,6 @@ zfs_iter_bookmarks(zfs_handle_t *zhp, zf
 	fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATETXG));
 	fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATION));
 
-	/* Allocate an nvlist to hold the bookmarks. */
-	bmarks = fnvlist_alloc();
-
 	if ((err = lzc_get_bookmarks(zhp->zfs_name, props, &bmarks)) != 0)
 		goto out;