From 15cfbb38fd6248529bf16f0cdc4ebb7adf38ab98 Mon Sep 17 00:00:00 2001 From: Jan Kryl Date: Sun, 5 Jul 2015 23:51:53 +0200 Subject: Illumos 5427 - memory leak in libzfs when doing rollback 5427 memory leak in libzfs when doing rollback Reviewed by: Michael Tsymbalyuk Reviewed by: Steven Hartland Approved by: Dan McDonald References https://github.com/illumos/illumos-gate/commit/b7070b7 https://www.illumos.org/issues/5427 Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf Closes #3569 --- lib/libzfs/libzfs_iter.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/libzfs/libzfs_iter.c b/lib/libzfs/libzfs_iter.c index e5140f2e1..5c1cf966a 100644 --- a/lib/libzfs/libzfs_iter.c +++ b/lib/libzfs/libzfs_iter.c @@ -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 @@ -192,9 +192,6 @@ zfs_iter_bookmarks(zfs_handle_t *zhp, zfs_iter_f func, void *data) 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; -- cgit v1.2.3