Page MenuHomeFreeBSD

D42672.diff
No OneTemporary

D42672.diff

diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -3136,6 +3136,41 @@
mtx_unlock(&mountlist_mtx);
}
+/*
+ * Clone the mnt_exjail field to a new mount point.
+ */
+void
+vfs_exjail_clone(struct mount *inmp, struct mount *outmp)
+{
+ struct ucred *cr;
+ struct prison *pr;
+
+ MNT_ILOCK(inmp);
+ cr = inmp->mnt_exjail;
+ if (cr != NULL) {
+ crhold(cr);
+ MNT_IUNLOCK(inmp);
+ pr = cr->cr_prison;
+ sx_slock(&allprison_lock);
+ if (!prison_isalive(pr)) {
+ sx_sunlock(&allprison_lock);
+ crfree(cr);
+ return;
+ }
+ MNT_ILOCK(outmp);
+ if (outmp->mnt_exjail == NULL) {
+ outmp->mnt_exjail = cr;
+ atomic_add_int(&pr->pr_exportcnt, 1);
+ cr = NULL;
+ }
+ MNT_IUNLOCK(outmp);
+ sx_sunlock(&allprison_lock);
+ if (cr != NULL)
+ crfree(cr);
+ } else
+ MNT_IUNLOCK(inmp);
+}
+
void
resume_all_fs(void)
{
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -980,6 +980,9 @@
* exported vnode operations
*/
+/* Define this to indicate that vfs_exjail_clone() exists for ZFS to use. */
+#define VFS_SUPPORTS_EXJAIL_CLONE 1
+
int dounmount(struct mount *, uint64_t, struct thread *);
int kernel_mount(struct mntarg *ma, uint64_t flags);
@@ -1016,6 +1019,7 @@
(struct mount *, struct netexport *, struct export_args *);
void vfs_periodic(struct mount *, int);
int vfs_busy(struct mount *, int);
+void vfs_exjail_clone(struct mount *, struct mount *);
void vfs_exjail_delete(struct prison *);
int vfs_export /* process mount export info */
(struct mount *, struct export_args *, bool);

File Metadata

Mime Type
text/plain
Expires
Sun, Jul 5, 9:51 AM (7 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34704288
Default Alt Text
D42672.diff (1 KB)

Event Timeline