Attachment 150099 Details for Bug 195095 – sysutils_fusefs-kmod.patch

[patch] sysutils_fusefs-kmod.patch

sysutils_fusefs-kmod.patch (text/plain), 3.85 KB, created by evgeni.dimitrov on 2014-12-02 16:46:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: evgeni.dimitrov

Created: 2014-12-02 16:46:26 UTC

Size: 3.85 KB

patch

obsolete

>Index: sysutils/fusefs-kmod/Makefile
>===================================================================
>--- sysutils/fusefs-kmod/Makefile	(revision 373759)
>+++ sysutils/fusefs-kmod/Makefile	(working copy)
>@@ -32,6 +32,7 @@
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-fuse_vnops.c
> .endif
> .if ${OSVERSION} >= 900000 && ${OSVERSION} < 1000000
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_main.c
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_vfsops.c
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-9-fuse_vnops.c
> .endif
>Index: sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c
>===================================================================
>--- sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c	(revision 0)
>+++ sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c	(working copy)
>@@ -0,0 +1,22 @@
>+--- fs/fuse/fuse_main.c.orig	2014-12-02 15:57:14.465629906 +0200
>++++ fs/fuse/fuse_main.c	2014-12-02 16:03:10.070605830 +0200
>+@@ -92,10 +92,19 @@
>+ 	.vfc_flags = VFCF_SYNTHETIC
>+ };
>+ 
>++#ifdef SYSCTL_NULL_INT_PTR
>++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD,
>++    SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION,
>++    "FUSE kernel abi major version");
>++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD,
>++    SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION,
>++    "FUSE kernel abi minor version");
>++#else
>+ SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD,
>+     0, FUSE_KERNEL_VERSION, "FUSE kernel abi major version");
>+ SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD,
>+     0, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version");
>++#endif // SYSCTL_NULL_INT_PTR
>+ 
>+ /******************************
>+  *
>Index: sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
>===================================================================
>--- sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c	(revision 373759)
>+++ sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c	(working copy)
>@@ -1,6 +1,6 @@
>---- fs/fuse/fuse_vfsops.c.orig
>-+++ fs/fuse/fuse_vfsops.c
>-@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
>+--- fs/fuse/fuse_vfsops.c.orig	2014-03-16 12:55:57.000000000 +0200
>++++ fs/fuse/fuse_vfsops.c	2014-12-02 16:02:35.879606170 +0200
>+@@ -62,7 +62,7 @@
>  #include <sys/errno.h>
>  #include <sys/param.h>
>  #include <sys/kernel.h>
>@@ -9,7 +9,32 @@
>  #include <sys/conf.h>
>  #include <sys/filedesc.h>
>  #include <sys/uio.h>
>-@@ -220,7 +220,6 @@ fuse_vfsop_mount(struct mount *mp)
>+@@ -113,13 +113,24 @@
>+ 	.vfs_statfs = fuse_vfsop_statfs,
>+ };
>+ 
>++#ifdef SYSCTL_NULL_INT_PTR
>++SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD,
>++    SYSCTL_NULL_INT_PTR, 1, "indicate async handshake");
>++#else
>+ SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD,
>+     0, 1, "indicate async handshake");
>++#endif // SYSCTL_NULL_INT_PTR
>+ static int fuse_enforce_dev_perms = 0;
>+ 
>++#ifdef SYSCTL_NULL_INT_PTR
>++SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW,
>++    &fuse_enforce_dev_perms, 0,
>++    "enforce fuse device permissions for secondary mounts");
>++#else
>+ SYSCTL_LONG(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW,
>+     &fuse_enforce_dev_perms, 0,
>+     "enforce fuse device permissions for secondary mounts");
>++#endif // SYSCTL_NULL_INT_PTR
>+ static unsigned sync_unmount = 1;
>+ 
>+ SYSCTL_UINT(_vfs_fuse, OID_AUTO, sync_unmount, CTLFLAG_RW,
>+@@ -220,7 +231,6 @@
>  	struct file *fp, *fptmp;
>  	char *fspec, *subtype;
>  	struct vfsoptlist *opts;
>@@ -17,7 +42,7 @@
>  
>  	subtype = NULL;
>  	max_read_set = 0;
>-@@ -290,7 +289,7 @@ fuse_vfsop_mount(struct mount *mp)
>+@@ -290,7 +300,7 @@
>  
>  	FS_DEBUG2G("mntopts 0x%jx\n", (uintmax_t)mntopts);
>  
>@@ -26,7 +51,7 @@
>  	if (err != 0) {
>  		FS_DEBUG("invalid or not opened device: data=%p\n", data);
>  		goto out;
>-@@ -459,7 +458,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp)
>+@@ -459,7 +469,7 @@
>  				FUSE_UNLOCK();
>  				VOP_UNLOCK(*vpp, 0);
>  				vrele(*vpp);

Actions: View | Diff

Attachments on bug 195095: 150099