D38662.id117721.diff
No OneTemporary
Actions

Size

964 B

Referenced Files

None

Subscribers

None

D38662.id117721.diff
View Options

	diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
	--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
	+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
	@@ -2495,7 +2495,9 @@
	mount_snapshot = -1;
	else
	jsys = JAIL_SYS_NEW;
	- if (jsys == JAIL_SYS_NEW) {
	+ switch (jsys) {
	+ case JAIL_SYS_NEW:
	+ {
	/* "zfs=new" or "zfs.": the prison gets its own ZFS info. /
	struct zfs_jailparam *zjp;

	@@ -2513,12 +2515,22 @@
	if (mount_snapshot != -1)
	zjp->mount_snapshot = mount_snapshot;
	mtx_unlock(&pr->pr_mtx);
	- } else {
	+ break;
	+ }
	+ case JAIL_SYS_INHERIT:
	/* "zfs=inherit": inherit the parent's ZFS info. */
	mtx_lock(&pr->pr_mtx);
	osd_jail_del(pr, zfs_jailparam_slot);
	mtx_unlock(&pr->pr_mtx);
	+ break;
	+ case -1:
	+ /*
	+ * If the setting being changed is not ZFS related
	+ * then do nothing.
	+ */
	+ break;
	}
	+
	return (0);
	}