diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-23 13:25:43 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-23 13:25:43 +0000 |
| commit | d3d31ab6f2a28d67593b8dcad42c0f03964ab6c0 (patch) | |
| tree | 9f6711836b72b99b8d94d2300e585e659d35b984 /usr/src/lib/libzfs/common/libzfs_dataset.c | |
| parent | 3f9daf6d27ccf52cc878e4bee17bf6f657f6f50d (diff) | |
| parent | e014e7f89c5273294b22953615734b04c11b1b4f (diff) | |
| download | illumos-joyent-d3d31ab6f2a28d67593b8dcad42c0f03964ab6c0.tar.gz | |
[illumos-gate merge]
commit e014e7f89c5273294b22953615734b04c11b1b4f
6641 deadman fires spuriously when running on VMware
commit 8808ac5dae118369991f158b6ab736cb2691ecde
4521 zfstest is trying to execute evil "zfs unmount -a"
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 034edebb24..2d443e7c71 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -26,8 +26,8 @@ * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Integros [integros.com] + * Copyright 2016 Nexenta Systems, Inc. */ #include <ctype.h> @@ -2911,6 +2911,15 @@ zfs_get_name(const zfs_handle_t *zhp) } /* + * Returns the name of the parent pool for the given zfs handle. + */ +const char * +zfs_get_pool_name(const zfs_handle_t *zhp) +{ + return (zhp->zpool_hdl->zpool_name); +} + +/* * Returns the type of the given zfs handle. */ zfs_type_t |