diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-16 07:57:22 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-16 07:57:22 -0200 |
| commit | ad0b136d63d70552782c5c4936ce97e8aa42442e (patch) | |
| tree | 44825d3d4a6cdbed690f2a6d5611f043119188fd /cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c | |
| parent | 2e02b14e19fd0fe27055d4a6e11a65e76882bf5f (diff) | |
| parent | d1d4e816ce49797ab1f23bb48cf5ee69018df284 (diff) | |
| download | FreeBSD-src-ad0b136d63d70552782c5c4936ce97e8aa42442e.zip FreeBSD-src-ad0b136d63d70552782c5c4936ce97e8aa42442e.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c index ab2007d..3b17579 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ /* @@ -624,9 +625,12 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap, zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM); while (zhp != NULL) { - (void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN, - origin, sizeof (origin), &src, NULL, 0, B_FALSE); - + if (zfs_prop_get(zhp, ZFS_PROP_ORIGIN, origin, + sizeof (origin), &src, NULL, 0, B_FALSE) != 0) { + (void) zfs_close(zhp); + zhp = NULL; + break; + } if (strncmp(origin, fromsnap, fsnlen) == 0) break; |
