diff options
| author | Jan Kryl <[email protected]> | 2015-07-05 23:51:53 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-07-10 12:09:32 -0700 |
| commit | 15cfbb38fd6248529bf16f0cdc4ebb7adf38ab98 (patch) | |
| tree | 09cb549080a28f8d1965a02502609219885ee4a0 | |
| parent | de0a9d763075cc688d6cb75c94d62dde912ed669 (diff) | |
Illumos 5427 - memory leak in libzfs when doing rollback
5427 memory leak in libzfs when doing rollback
Reviewed by: Michael Tsymbalyuk <[email protected]>
Reviewed by: Steven Hartland <[email protected]>
Approved by: Dan McDonald <[email protected]>
References
https://github.com/illumos/illumos-gate/commit/b7070b7
https://www.illumos.org/issues/5427
Ported-by: kernelOfTruth [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3569
| -rw-r--r-- | lib/libzfs/libzfs_iter.c | 5 |
1 files changed, 1 insertions, 4 deletions
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 <stdio.h> @@ -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; |