diff options
| author | Jorgen Lundman <[email protected]> | 2021-09-21 00:29:59 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-20 09:29:59 -0600 |
| commit | 1d901c3ee5965e9b3b4c33cd40942bcf9df2531a (patch) | |
| tree | d0b9c15e5bd6da0dacfd2abc3b77bdc02f347c53 /lib/libzfs/libzfs.abi | |
| parent | 8a3fe59c0364ee1732fc16a67e908ec1daea3058 (diff) | |
Upstream: unmount snapshots before destroying them on macOS
Add function zfs_destroy_snaps_nvl_os() call. The main issue is that
macOS needs to unmount any mounted snapshots before they can be
destroyed. Other platforms can handle this in the kernel, but sending
a storm of zed events to unmount seems undesirable when we can do it
in userland to start with.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Signed-off-by: Jorgen Lundman <[email protected]>
Co-authored-by: ilovezfs <[email protected]>
Closes #12550
Diffstat (limited to 'lib/libzfs/libzfs.abi')
| -rw-r--r-- | lib/libzfs/libzfs.abi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi index a2c79c856..c5b097525 100644 --- a/lib/libzfs/libzfs.abi +++ b/lib/libzfs/libzfs.abi @@ -97,6 +97,7 @@ <elf-symbol name='zfs_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_destroy_snaps' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_destroy_snaps_nvl' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> + <elf-symbol name='zfs_destroy_snaps_nvl_os' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_expand_proplist' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_foreach_mountpoint' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> <elf-symbol name='zfs_get_all_props' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/> @@ -4161,6 +4162,11 @@ <parameter type-id='95e97e5e' name='len'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='zfs_destroy_snaps_nvl_os' mangled-name='zfs_destroy_snaps_nvl_os' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_destroy_snaps_nvl_os'> + <parameter type-id='b0382bb3' name='hdl'/> + <parameter type-id='5ce45b60' name='snaps'/> + <return type-id='95e97e5e'/> + </function-decl> <function-decl name='libzfs_error_init' mangled-name='libzfs_error_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_error_init'> <parameter type-id='95e97e5e' name='error'/> <return type-id='80f4b756'/> |