diff options
| author | Jan Kryl <jan.kryl@nexenta.com> | 2014-12-11 08:35:45 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2014-12-11 15:57:20 -0500 |
| commit | b7070b7dbcc2758a7f87cefb69ad42887a287152 (patch) | |
| tree | f95c14250ec708e60ea934f5e7de1ff630b98e50 /usr/src/lib/libzfs | |
| parent | 94bdecd9e84ae1042607002db3e64a6849da5874 (diff) | |
| download | illumos-joyent-b7070b7dbcc2758a7f87cefb69ad42887a287152.tar.gz | |
5427 memory leak in libzfs when doing rollback
Reviewed by: Michael Tsymbalyuk <mtzaurus@gmail.com>
Reviewed by: Steven Hartland <killing@multiplay.co.uk>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/lib/libzfs')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_iter.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_iter.c b/usr/src/lib/libzfs/common/libzfs_iter.c index f8ad5014cb..5fdfe1d591 100644 --- a/usr/src/lib/libzfs/common/libzfs_iter.c +++ b/usr/src/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 <stdio.h> @@ -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; |