diff options
| author | riggs <riggs@FreeBSD.org> | 2015-01-27 02:57:56 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-01-27 02:57:56 +0800 |
| commit | ae2f0ef8d0e248ecbd530c6a8e747169ac3494b5 (patch) | |
| tree | 26f0e53047a71d397167aa08e2596c65fa15d0c9 /sysutils/fusefs-kmod/files | |
| parent | fe76746cbd034e1ba6c1031a631f1045eec32b31 (diff) | |
| download | freebsd-ports-gnome-ae2f0ef8d0e248ecbd530c6a8e747169ac3494b5.tar.gz freebsd-ports-gnome-ae2f0ef8d0e248ecbd530c6a8e747169ac3494b5.tar.zst freebsd-ports-gnome-ae2f0ef8d0e248ecbd530c6a8e747169ac3494b5.zip | |
Fix build failure on 9.x
While on it:
- Pet portlint
PR: 195095
Submitted by: woot-woot@yandex.ru (PR) evgeni.dimitrov@gmail.com (patch)
Reviewed by: dpejesh@yahoo.com (maintainer)
Approved by: dpejesh@yahoo.com (maintainer)
MFH: 2015Q1
Diffstat (limited to 'sysutils/fusefs-kmod/files')
| -rw-r--r-- | sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c | 22 | ||||
| -rw-r--r-- | sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c | 37 |
2 files changed, 53 insertions, 6 deletions
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c new file mode 100644 index 000000000000..118e861afcc2 --- /dev/null +++ b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c @@ -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 + + /****************************** + * diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c index f38a35662abf..c6fb4c368a73 100644 --- a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c +++ b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c @@ -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); |