summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs
diff options
context:
space:
mode:
authormaybee <none@none>2006-03-08 07:42:20 -0800
committermaybee <none@none>2006-03-08 07:42:20 -0800
commitbb963f1cfd0c29d3203584c421c00a566367047c (patch)
tree955ccc8ef266c1d5040e4c1fa1e4094289e43a4d /usr/src/lib/libzfs
parent6d24e334e75789fbe89b6a018c5023ce278e15fa (diff)
downloadillumos-gate-bb963f1cfd0c29d3203584c421c00a566367047c.tar.gz
6355162 'zfs restore -d' should not succeed upon a volume
6368561 zfs panic at zfs:zfsctl_snapdir_inactive() 6374110 ZFS Panic in zfs_lookup() during snapshot creation
Diffstat (limited to 'usr/src/lib/libzfs')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_dataset.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c
index 1e6e1d79ab..ee78f30610 100644
--- a/usr/src/lib/libzfs/common/libzfs_dataset.c
+++ b/usr/src/lib/libzfs/common/libzfs_dataset.c
@@ -2494,12 +2494,11 @@ zfs_restore(const char *tosnap, int isprefix, int verbose, int dryrun)
zfs_handle_t *h;
/* make sure prefix exists */
- h = zfs_open(tosnap, ZFS_TYPE_FILESYSTEM |
- ZFS_TYPE_VOLUME);
+ h = zfs_open(tosnap, ZFS_TYPE_FILESYSTEM);
if (h == NULL) {
zfs_error(dgettext(TEXT_DOMAIN,
"cannot restore: "
- "filesystem %s does not exist"),
+ "%s is an invalid destination"),
tosnap);
return (-1);
}