From d45822d0ec4cb46942d86b0e22c6810d007d1d39 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Mon, 15 Dec 2014 08:02:22 +0000 Subject: [PATCH] 5427 memory leak in libzfs when doing rollback Reviewed by: Michael Tsymbalyuk Reviewed by: Steven Hartland Approved by: Dan McDonald Author: Jan Kryl illumos/illumos-gate@b7070b7dbcc2758a7f87cefb69ad42887a287152 --- lib/libzfs/common/libzfs_iter.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libzfs/common/libzfs_iter.c b/lib/libzfs/common/libzfs_iter.c index f8ad5014cbbd..5fdfe1d591ac 100644 --- a/lib/libzfs/common/libzfs_iter.c +++ b/lib/libzfs/common/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 @@ -186,9 +186,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;