Skip to content

Commit

Permalink
5427 memory leak in libzfs when doing rollback
Browse files Browse the repository at this point in the history
Reviewed by: Michael Tsymbalyuk <[email protected]>
Reviewed by: Steven Hartland <[email protected]>
Approved by: Dan McDonald <[email protected]>
  • Loading branch information
Jan Kryl authored and Dan McDonald committed Dec 11, 2014
1 parent 94bdecd commit b7070b7
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions usr/src/lib/libzfs/common/libzfs_iter.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit b7070b7

Please sign in to comment.