Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Illumos 5847 - libzfs_diff should check zfs_prop_get() return 

5847 libzfs_diff should check zfs_prop_get() return
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Albert Lee <trisk@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>

References:
  https://www.illumos.org/issues/5847
  https://github.com/illumos/illumos-gate/commit/8430278

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3412
This commit is contained in:
Alexander Eremin 2015-05-13 15:15:56 -07:00 committed by Brian Behlendorf
parent e5fd1dd682
commit 7fec46b9d8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libzfs/libzfs_diff.c
View File

@ -21,6 +21,7 @@
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/ */
/* /*
@ -620,9 +621,12 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap,
zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM); zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM);
while (zhp != NULL) { while (zhp != NULL) {
(void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN, if (zfs_prop_get(zhp, ZFS_PROP_ORIGIN, origin,
origin, sizeof (origin), &src, NULL, 0, B_FALSE); sizeof (origin), &src, NULL, 0, B_FALSE) != 0) {
(void) zfs_close(zhp);
zhp = NULL;
break;
}
if (strncmp(origin, fromsnap, fsnlen) == 0) if (strncmp(origin, fromsnap, fsnlen) == 0)
break; break;