summaryrefslogtreecommitdiffstats
path: root/lib/libspl/include
diff options
context:
space:
mode:
authorRyan Moeller <[email protected]>2020-07-06 14:57:24 -0400
committerGitHub <[email protected]>2020-07-06 11:57:24 -0700
commitfb91f0367e91fb74a391f56d80fa3d3a9c6a2902 (patch)
tree1ca19c49ad65b9bd4db18faa1ab51e14b7f32697 /lib/libspl/include
parentcd32b4f5b79c97b293f7be3fe9ddfc9024f7d734 (diff)
Add zpool_nextboot, move zfs_jail to libzfs.h
FreeBSD has a zfsbootcfg command that wants zpool_nextboot in libzfs. Add the function to FreeBSD's libzfs_compat.c, and while here move the prototype for zfs_jail out of param.h in FreeBSD's SPL and into libzfs.h under an ifdef for FreeBSD, where the prototype for zpool_nextboot joins it. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #10524
Diffstat (limited to 'lib/libspl/include')
-rw-r--r--lib/libspl/include/os/freebsd/sys/param.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/libspl/include/os/freebsd/sys/param.h b/lib/libspl/include/os/freebsd/sys/param.h
index c0ad8d679..e2abef189 100644
--- a/lib/libspl/include/os/freebsd/sys/param.h
+++ b/lib/libspl/include/os/freebsd/sys/param.h
@@ -61,10 +61,4 @@ extern size_t spl_pagesize(void);
extern int execvpe(const char *name, char * const argv[], char * const envp[]);
-struct zfs_handle;
-/*
- * Attach/detach the given filesystem to/from the given jail.
- */
-extern int zfs_jail(struct zfs_handle *zhp, int jailid, int attach);
-
#endif