diff options
| author | Giuseppe Di Natale <[email protected]> | 2017-02-03 13:24:44 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-03 13:24:44 -0800 |
| commit | d21d5b8248cf38d1518c9beccc350bc9081ff6be (patch) | |
| tree | 0049ce696ca24c5c10051b7186d9f205153cf4fd /include | |
| parent | 9b7b9cd370ed2ec4c8ee346bcb95cb30ba7e9ba9 (diff) | |
OpenZFS 4521 - zfstest is trying to execute evil "zfs unmount -a"
Authored by: Yuri Pankov <[email protected]>
Reviewed by: Andriy Gapon <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: John Kennedy <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
Porting Notes:
- Correctly set __ZFS_POOL_RESTRICT in inherit_001_pos
OpenZFS-issue: https://www.illumos.org/issues/4521
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/8808ac5
Closes #5674
Diffstat (limited to 'include')
| -rw-r--r-- | include/libzfs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/libzfs.h b/include/libzfs.h index d74bf6b10..0b5fe76dc 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -24,8 +24,8 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2016, Intel Corporation. + * Copyright 2016 Nexenta Systems, Inc. */ #ifndef _LIBZFS_H @@ -237,6 +237,7 @@ extern void zpool_free_handles(libzfs_handle_t *); */ typedef int (*zpool_iter_f)(zpool_handle_t *, void *); extern int zpool_iter(libzfs_handle_t *, zpool_iter_f, void *); +extern boolean_t zpool_skip_pool(const char *); /* * Functions to create and destroy pools @@ -448,6 +449,7 @@ extern void zfs_close(zfs_handle_t *); extern zfs_type_t zfs_get_type(const zfs_handle_t *); extern const char *zfs_get_name(const zfs_handle_t *); extern zpool_handle_t *zfs_get_pool_handle(const zfs_handle_t *); +extern const char *zfs_get_pool_name(const zfs_handle_t *); /* * Property management functions. Some functions are shared with the kernel, |