[Glibc-bsd-commits] r5609 - trunk/fuse4bsd/debian/patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sun Oct 5 22:32:27 UTC 2014
Author: stevenc-guest
Date: 2014-10-05 22:32:26 +0000 (Sun, 05 Oct 2014)
New Revision: 5609
Removed:
trunk/fuse4bsd/debian/patches/001_ports.diff
trunk/fuse4bsd/debian/patches/003_kernel_api.diff
trunk/fuse4bsd/debian/patches/004_freebsd_macro.diff
trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff
Modified:
trunk/fuse4bsd/debian/patches/series
Log:
Delete redundant patches:
- 001_ports.diff
- 003_kernel_api.diff
- 004_freebsd_macro.diff
- prevent_kfreebsd10_build.diff
Deleted: trunk/fuse4bsd/debian/patches/001_ports.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/001_ports.diff 2014-10-05 22:26:12 UTC (rev 5608)
+++ trunk/fuse4bsd/debian/patches/001_ports.diff 2014-10-05 22:32:26 UTC (rev 5609)
@@ -1,352 +0,0 @@
-
-Based on http://www.freebsd.org/cgi/cvsweb.cgi/ports/sysutils/fusefs-kmod/files/
-
-diff -ur a/fuse_module/Makefile b/fuse_module/Makefile
---- a/fuse_module/Makefile 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/Makefile 2011-06-06 14:58:54.000000000 +0000
-@@ -1,3 +1,5 @@
-+.undef KERNCONF
-+
- .include "../Makefile.common"
-
- SRCS = fuse_main.c \
-@@ -22,7 +24,8 @@
-
- .if defined(KERNCONF)
- KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g'
--KERNCONFDIR= /usr/obj/usr/src/sys/${KERNCONF1}
-+KRNLOBJDIR!= make -C /usr/src -f /usr/src/Makefile.inc1 -V KRNLOBJDIR
-+KERNCONFDIR= ${KRNLOBJDIR}/${KERNCONF1}
- .endif
-
- .if defined(KERNCONFDIR)
-diff -ur a/fuse_module/fuse.h b/fuse_module/fuse.h
---- a/fuse_module/fuse.h 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse.h 2011-06-06 14:58:54.000000000 +0000
-@@ -25,6 +25,22 @@
- #endif
- #endif
-
-+#ifndef VFSOPS_TAKES_THREAD
-+#if __FreeBSD_version >= 800087
-+#define VFSOPS_TAKES_THREAD 0
-+#else
-+#define VFSOPS_TAKES_THREAD 1
-+#endif
-+#endif
-+
-+#ifndef VOP_ACCESS_TAKES_ACCMODE_T
-+#if __FreeBSD_version >= 800052
-+#define VOP_ACCESS_TAKES_ACCMODE_T 1
-+#else
-+#define VOP_ACCESS_TAKES_ACCMODE_T 0
-+#endif
-+#endif
-+
- #ifndef VOP_OPEN_TAKES_FP
- #if __FreeBSD_version >= 700044
- #define VOP_OPEN_TAKES_FP 1
-@@ -49,6 +65,14 @@
- #endif
- #endif
-
-+#ifndef VOP_GETATTR_TAKES_THREAD
-+#if __FreeBSD_version >= 800046
-+#define VOP_GETATTR_TAKES_THREAD 0
-+#else
-+#define VOP_GETATTR_TAKES_THREAD 1
-+#endif
-+#endif
-+
- #ifndef USE_PRIVILEGE_API
- /*
- * __FreeBSD_version bump was omitted for introduction of
-diff -ur a/fuse_module/fuse_dev.c b/fuse_module/fuse_dev.c
---- a/fuse_module/fuse_dev.c 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse_dev.c 2011-06-06 14:58:54.000000000 +0000
-@@ -52,8 +52,13 @@
- .d_read = fusedev_read,
- .d_write = fusedev_write,
- .d_version = D_VERSION,
-+#ifndef D_NEEDMINOR
-+#define D_NEEDMINOR 0
-+#endif
- #if ! DO_GIANT_MANUALLY
-- .d_flags = D_NEEDGIANT,
-+ .d_flags = D_NEEDMINOR|D_NEEDGIANT,
-+#else
-+ .d_flags = D_NEEDMINOR,
- #endif
- };
-
-@@ -548,7 +553,12 @@
- /* find any existing device, or allocate new unit number */
- i = clone_create(&fuseclones, &fuse_cdevsw, &unit, dev, 0);
- if (i) {
-- *dev = make_dev(&fuse_cdevsw, unit2minor(unit),
-+ *dev = make_dev(&fuse_cdevsw,
-+#if __FreeBSD_version < 800062
-+ unit2minor(unit),
-+#else /* __FreeBSD_version >= 800062 */
-+ unit,
-+#endif /* __FreeBSD_version < 800062 */
- UID_ROOT, GID_OPERATOR,
- S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
- "fuse%d", unit);
-diff -ur a/fuse_module/fuse_io.c b/fuse_module/fuse_io.c
---- a/fuse_module/fuse_io.c 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse_io.c 2011-06-06 14:58:54.000000000 +0000
-@@ -35,6 +35,10 @@
- #include <vm/vnode_pager.h>
- #include <vm/vm_object.h>
-
-+#if (__FreeBSD__ >= 8)
-+#define vfs_bio_set_validclean vfs_bio_set_valid
-+#endif
-+
- #include "fuse.h"
- #include "fuse_session.h"
- #include "fuse_vnode.h"
-@@ -157,7 +161,11 @@
- goto out;
-
- if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {
-- if ((err = VOP_GETATTR(vp, &va, cred, td)))
-+ if ((err = VOP_GETATTR(vp, &va, cred
-+#if VOP_GETATTR_TAKES_THREAD
-+ , td
-+#endif
-+ )))
- goto out;
- uio->uio_offset = va.va_size;
- } else if ((flags & FOF_OFFSET) == 0)
-@@ -823,7 +831,11 @@
- #if FUSELIB_CONFORM_BIOREAD
- struct vattr va;
-
-- if ((err = VOP_GETATTR(vp, &va, cred, curthread)))
-+ if ((err = VOP_GETATTR(vp, &va, cred
-+#if VOP_GETATTR_TAKES_THREAD
-+ , curthread
-+#endif
-+ )))
- goto out;
- #endif
-
-diff -ur a/fuse_module/fuse_main.c b/fuse_module/fuse_main.c
---- a/fuse_module/fuse_main.c 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse_main.c 2011-06-06 14:58:54.000000000 +0000
-@@ -108,6 +108,9 @@
- switch (what) {
- case MOD_LOAD: /* kldload */
-
-+#if __FreeBSD_version > 800009
-+ fuse_fileops.fo_truncate = vnops.fo_truncate;
-+#endif
- fuse_fileops.fo_ioctl = vnops.fo_ioctl;
- fuse_fileops.fo_poll = vnops.fo_poll;
- fuse_fileops.fo_kqfilter = vnops.fo_kqfilter;
-diff -ur a/fuse_module/fuse_vfsops.c b/fuse_module/fuse_vfsops.c
---- a/fuse_module/fuse_vfsops.c 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse_vfsops.c 2011-06-06 14:58:54.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <sys/namei.h>
- #include <sys/mount.h>
- #include <sys/sysctl.h>
-+#include <sys/fcntl.h>
-
- #include "fuse.h"
- #include "fuse_session.h"
-@@ -213,8 +214,14 @@
- * Mount system call
- */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_mount(struct mount *mp, struct thread *td)
- {
-+#else
-+fuse_mount(struct mount *mp)
-+{
-+ struct thread *td = curthread;
-+#endif
- int err = 0;
- size_t len;
- char *fspec, *subtype = NULL;
-@@ -529,8 +536,14 @@
- * Unmount system call
- */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_unmount(struct mount *mp, int mntflags, struct thread *td)
- {
-+#else
-+fuse_unmount(struct mount *mp, int mntflags)
-+{
-+ struct thread *td = curthread;
-+#endif
- int flags = 0, err = 0;
- struct fuse_data *data;
- struct fuse_secondary_data *fsdat = NULL;
-@@ -633,8 +646,14 @@
-
- /* stolen from portalfs */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td)
- {
-+#else
-+fuse_root(struct mount *mp, int flags, struct vnode **vpp)
-+{
-+ struct thread *td = curthread;
-+#endif
- /*
- * Return locked reference to root.
- */
-@@ -650,7 +669,11 @@
- data = fsdat->master;
- sx_slock(&data->mhierlock);
- if (data->mpri == FM_PRIMARY)
-- err = fuse_root(data->mp, flags, vpp, td);
-+ err = fuse_root(data->mp, flags, vpp
-+#if VFSOPS_TAKES_THREAD
-+ , td
-+#endif
-+ );
- else
- err = ENXIO;
- sx_sunlock(&data->mhierlock);
-@@ -667,7 +690,11 @@
- if (vp->v_type == VNON) {
- struct vattr va;
-
-- (void)VOP_GETATTR(vp, &va, td->td_ucred, td);
-+ (void)VOP_GETATTR(vp, &va, td->td_ucred
-+#if VOP_GETATTR_TAKES_THREAD
-+ , td
-+#endif
-+ );
- }
- *vpp = vp;
- #if _DEBUG2G
-@@ -678,8 +705,14 @@
- }
-
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
- {
-+#else
-+fuse_statfs(struct mount *mp, struct statfs *sbp)
-+{
-+ struct thread *td = curthread;
-+#endif
- struct fuse_dispatcher fdi;
- struct fuse_statfs_out *fsfo;
- struct fuse_data *data;
-@@ -696,7 +729,11 @@
-
- sx_slock(&data->mhierlock);
- if (data->mpri == FM_PRIMARY)
-- err = fuse_statfs(data->mp, sbp, td);
-+ err = fuse_statfs(data->mp, sbp
-+#if VFSOPS_TAKES_THREAD
-+ , td
-+#endif
-+ );
- else
- err = ENXIO;
- sx_sunlock(&data->mhierlock);
-@@ -794,7 +831,11 @@
- if (nodeid == FUSE_ROOT_ID) {
- if (parentid != FUSE_NULL_ID)
- return (ENOENT);
-- err = VFS_ROOT(mp, myflags, vpp, td);
-+ err = VFS_ROOT(mp, myflags, vpp
-+#if VFSOPS_TAKES_THREAD
-+ , td
-+#endif
-+ );
- if (err)
- return (err);
- KASSERT(*vpp, ("we neither err'd nor found the root node"));
-diff -ur a/fuse_module/fuse_vnops.c b/fuse_module/fuse_vnops.c
---- a/fuse_module/fuse_vnops.c 2009-02-26 22:21:58.000000000 +0000
-+++ b/fuse_module/fuse_vnops.c 2011-06-06 14:58:54.000000000 +0000
-@@ -799,8 +799,11 @@
- struct vnode *vp = ap->a_vp;
- struct vattr *vap = ap->a_vap;
- struct ucred *cred = ap->a_cred;
-+#if VOP_GETATTR_TAKES_THREAD
- struct thread *td = ap->a_td;
--
-+#else
-+ struct thread *td = curthread;
-+#endif
- struct fuse_dispatcher fdi;
- struct timespec uptsp;
- int err = 0;
-@@ -871,7 +874,11 @@
- fuse_access(ap)
- struct vop_access_args /* {
- struct vnode *a_vp;
-+#if VOP_ACCESS_TAKES_ACCMODE_T
-+ accmode_t a_accmode;
-+#else
- int a_mode;
-+#endif
- struct ucred *a_cred;
- struct thread *a_td;
- } */ *ap;
-@@ -886,7 +893,13 @@
- else
- facp.facc_flags |= FACCESS_DO_ACCESS;
-
-- return fuse_access_i(vp, ap->a_mode, ap->a_cred, ap->a_td, &facp);
-+ return fuse_access_i(vp,
-+#if VOP_ACCESS_TAKES_ACCMODE_T
-+ ap->a_accmode,
-+#else
-+ ap->a_mode,
-+#endif
-+ ap->a_cred, ap->a_td, &facp);
- }
-
- /*
-@@ -946,7 +959,11 @@
- /* We are to do the check in-kernel */
-
- if (! (facp->facc_flags & FACCESS_VA_VALID)) {
-- err = VOP_GETATTR(vp, VTOVA(vp), cred, td);
-+ err = VOP_GETATTR(vp, VTOVA(vp), cred
-+#if VOP_GETATTR_TAKES_THREAD
-+ , td
-+#endif
-+ );
- if (err)
- return (err);
- facp->facc_flags |= FACCESS_VA_VALID;
-@@ -1929,7 +1946,11 @@
- * It will not invalidate pages which are dirty, locked, under
- * writeback or mapped into pagetables.")
- */
-+#if VOP_GETATTR_TAKES_THREAD
- err = vinvalbuf(vp, 0, td, PCATCH, 0);
-+#else
-+ err = vinvalbuf(vp, 0, PCATCH, 0);
-+#endif
- fufh->flags |= FOPEN_KEEP_CACHE;
- }
-
-@@ -3005,8 +3026,11 @@
- struct vattr *vap = ap->a_vap;
- struct vnode *vp = ap->a_vp;
- struct ucred *cred = ap->a_cred;
-+#if VOP_GETATTR_TAKES_THREAD
- struct thread *td = ap->a_td;
--
-+#else
-+ struct thread *td = curthread;
-+#endif
- int err = 0;
- struct fuse_dispatcher fdi;
- struct fuse_setattr_in *fsai;
Deleted: trunk/fuse4bsd/debian/patches/003_kernel_api.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/003_kernel_api.diff 2014-10-05 22:26:12 UTC (rev 5608)
+++ trunk/fuse4bsd/debian/patches/003_kernel_api.diff 2014-10-05 22:32:26 UTC (rev 5609)
@@ -1,382 +0,0 @@
-
-Stolen from FUSE source tree.
-
---- /dev/null
-+++ b/fuse_module/fuse_kernel.h
-@@ -0,0 +1,376 @@
-+/*
-+ This file defines the kernel interface of FUSE
-+ Copyright (C) 2001-2007 Miklos Szeredi <miklos at szeredi.hu>
-+
-+ This program can be distributed under the terms of the GNU GPL.
-+ See the file COPYING.
-+
-+ This -- and only this -- header file may also be distributed under
-+ the terms of the BSD Licence as follows:
-+
-+ Copyright (C) 2001-2007 Miklos Szeredi. All rights reserved.
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions
-+ are met:
-+ 1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+ 2. Redistributions in binary form must reproduce the above copyright
-+ notice, this list of conditions and the following disclaimer in the
-+ documentation and/or other materials provided with the distribution.
-+
-+ THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ SUCH DAMAGE.
-+*/
-+
-+#ifndef linux
-+#include <sys/types.h>
-+#define __u64 uint64_t
-+#define __u32 uint32_t
-+#define __s32 int32_t
-+#else
-+#include <asm/types.h>
-+#include <linux/major.h>
-+#endif
-+
-+/** Version number of this interface */
-+#define FUSE_KERNEL_VERSION 7
-+
-+/** Minor version number of this interface */
-+#define FUSE_KERNEL_MINOR_VERSION 8
-+
-+/** The node ID of the root inode */
-+#define FUSE_ROOT_ID 1
-+
-+/** The major number of the fuse character device */
-+#define FUSE_MAJOR MISC_MAJOR
-+
-+/** The minor number of the fuse character device */
-+#define FUSE_MINOR 229
-+
-+/* Make sure all structures are padded to 64bit boundary, so 32bit
-+ userspace works under 64bit kernels */
-+
-+struct fuse_attr {
-+ __u64 ino;
-+ __u64 size;
-+ __u64 blocks;
-+ __u64 atime;
-+ __u64 mtime;
-+ __u64 ctime;
-+ __u32 atimensec;
-+ __u32 mtimensec;
-+ __u32 ctimensec;
-+ __u32 mode;
-+ __u32 nlink;
-+ __u32 uid;
-+ __u32 gid;
-+ __u32 rdev;
-+};
-+
-+struct fuse_kstatfs {
-+ __u64 blocks;
-+ __u64 bfree;
-+ __u64 bavail;
-+ __u64 files;
-+ __u64 ffree;
-+ __u32 bsize;
-+ __u32 namelen;
-+ __u32 frsize;
-+ __u32 padding;
-+ __u32 spare[6];
-+};
-+
-+struct fuse_file_lock {
-+ __u64 start;
-+ __u64 end;
-+ __u32 type;
-+ __u32 pid; /* tgid */
-+};
-+
-+/**
-+ * Bitmasks for fuse_setattr_in.valid
-+ */
-+#define FATTR_MODE (1 << 0)
-+#define FATTR_UID (1 << 1)
-+#define FATTR_GID (1 << 2)
-+#define FATTR_SIZE (1 << 3)
-+#define FATTR_ATIME (1 << 4)
-+#define FATTR_MTIME (1 << 5)
-+#define FATTR_FH (1 << 6)
-+
-+/**
-+ * Flags returned by the OPEN request
-+ *
-+ * FOPEN_DIRECT_IO: bypass page cache for this open file
-+ * FOPEN_KEEP_CACHE: don't invalidate the data cache on open
-+ */
-+#define FOPEN_DIRECT_IO (1 << 0)
-+#define FOPEN_KEEP_CACHE (1 << 1)
-+
-+/**
-+ * INIT request/reply flags
-+ */
-+#define FUSE_ASYNC_READ (1 << 0)
-+#define FUSE_POSIX_LOCKS (1 << 1)
-+
-+/**
-+ * Release flags
-+ */
-+#define FUSE_RELEASE_FLUSH (1 << 0)
-+
-+enum fuse_opcode {
-+ FUSE_LOOKUP = 1,
-+ FUSE_FORGET = 2, /* no reply */
-+ FUSE_GETATTR = 3,
-+ FUSE_SETATTR = 4,
-+ FUSE_READLINK = 5,
-+ FUSE_SYMLINK = 6,
-+ FUSE_MKNOD = 8,
-+ FUSE_MKDIR = 9,
-+ FUSE_UNLINK = 10,
-+ FUSE_RMDIR = 11,
-+ FUSE_RENAME = 12,
-+ FUSE_LINK = 13,
-+ FUSE_OPEN = 14,
-+ FUSE_READ = 15,
-+ FUSE_WRITE = 16,
-+ FUSE_STATFS = 17,
-+ FUSE_RELEASE = 18,
-+ FUSE_FSYNC = 20,
-+ FUSE_SETXATTR = 21,
-+ FUSE_GETXATTR = 22,
-+ FUSE_LISTXATTR = 23,
-+ FUSE_REMOVEXATTR = 24,
-+ FUSE_FLUSH = 25,
-+ FUSE_INIT = 26,
-+ FUSE_OPENDIR = 27,
-+ FUSE_READDIR = 28,
-+ FUSE_RELEASEDIR = 29,
-+ FUSE_FSYNCDIR = 30,
-+ FUSE_GETLK = 31,
-+ FUSE_SETLK = 32,
-+ FUSE_SETLKW = 33,
-+ FUSE_ACCESS = 34,
-+ FUSE_CREATE = 35,
-+ FUSE_INTERRUPT = 36,
-+ FUSE_BMAP = 37,
-+ FUSE_DESTROY = 38,
-+};
-+
-+/* The read buffer is required to be at least 8k, but may be much larger */
-+#define FUSE_MIN_READ_BUFFER 8192
-+
-+struct fuse_entry_out {
-+ __u64 nodeid; /* Inode ID */
-+ __u64 generation; /* Inode generation: nodeid:gen must
-+ be unique for the fs's lifetime */
-+ __u64 entry_valid; /* Cache timeout for the name */
-+ __u64 attr_valid; /* Cache timeout for the attributes */
-+ __u32 entry_valid_nsec;
-+ __u32 attr_valid_nsec;
-+ struct fuse_attr attr;
-+};
-+
-+struct fuse_forget_in {
-+ __u64 nlookup;
-+};
-+
-+struct fuse_attr_out {
-+ __u64 attr_valid; /* Cache timeout for the attributes */
-+ __u32 attr_valid_nsec;
-+ __u32 dummy;
-+ struct fuse_attr attr;
-+};
-+
-+struct fuse_mknod_in {
-+ __u32 mode;
-+ __u32 rdev;
-+};
-+
-+struct fuse_mkdir_in {
-+ __u32 mode;
-+ __u32 padding;
-+};
-+
-+struct fuse_rename_in {
-+ __u64 newdir;
-+};
-+
-+struct fuse_link_in {
-+ __u64 oldnodeid;
-+};
-+
-+struct fuse_setattr_in {
-+ __u32 valid;
-+ __u32 padding;
-+ __u64 fh;
-+ __u64 size;
-+ __u64 unused1;
-+ __u64 atime;
-+ __u64 mtime;
-+ __u64 unused2;
-+ __u32 atimensec;
-+ __u32 mtimensec;
-+ __u32 unused3;
-+ __u32 mode;
-+ __u32 unused4;
-+ __u32 uid;
-+ __u32 gid;
-+ __u32 unused5;
-+};
-+
-+struct fuse_open_in {
-+ __u32 flags;
-+ __u32 mode;
-+};
-+
-+struct fuse_open_out {
-+ __u64 fh;
-+ __u32 open_flags;
-+ __u32 padding;
-+};
-+
-+struct fuse_release_in {
-+ __u64 fh;
-+ __u32 flags;
-+ __u32 release_flags;
-+ __u64 lock_owner;
-+};
-+
-+struct fuse_flush_in {
-+ __u64 fh;
-+ __u32 unused;
-+ __u32 padding;
-+ __u64 lock_owner;
-+};
-+
-+struct fuse_read_in {
-+ __u64 fh;
-+ __u64 offset;
-+ __u32 size;
-+ __u32 padding;
-+};
-+
-+struct fuse_write_in {
-+ __u64 fh;
-+ __u64 offset;
-+ __u32 size;
-+ __u32 write_flags;
-+};
-+
-+struct fuse_write_out {
-+ __u32 size;
-+ __u32 padding;
-+};
-+
-+#define FUSE_COMPAT_STATFS_SIZE 48
-+
-+struct fuse_statfs_out {
-+ struct fuse_kstatfs st;
-+};
-+
-+struct fuse_fsync_in {
-+ __u64 fh;
-+ __u32 fsync_flags;
-+ __u32 padding;
-+};
-+
-+struct fuse_setxattr_in {
-+ __u32 size;
-+ __u32 flags;
-+};
-+
-+struct fuse_getxattr_in {
-+ __u32 size;
-+ __u32 padding;
-+};
-+
-+struct fuse_getxattr_out {
-+ __u32 size;
-+ __u32 padding;
-+};
-+
-+struct fuse_lk_in {
-+ __u64 fh;
-+ __u64 owner;
-+ struct fuse_file_lock lk;
-+};
-+
-+struct fuse_lk_out {
-+ struct fuse_file_lock lk;
-+};
-+
-+struct fuse_access_in {
-+ __u32 mask;
-+ __u32 padding;
-+};
-+
-+struct fuse_init_in {
-+ __u32 major;
-+ __u32 minor;
-+ __u32 max_readahead;
-+ __u32 flags;
-+};
-+
-+struct fuse_init_out {
-+ __u32 major;
-+ __u32 minor;
-+ __u32 max_readahead;
-+ __u32 flags;
-+ __u32 unused;
-+ __u32 max_write;
-+};
-+
-+struct fuse_interrupt_in {
-+ __u64 unique;
-+};
-+
-+struct fuse_bmap_in {
-+ __u64 block;
-+ __u32 blocksize;
-+ __u32 padding;
-+};
-+
-+struct fuse_bmap_out {
-+ __u64 block;
-+};
-+
-+struct fuse_in_header {
-+ __u32 len;
-+ __u32 opcode;
-+ __u64 unique;
-+ __u64 nodeid;
-+ __u32 uid;
-+ __u32 gid;
-+ __u32 pid;
-+ __u32 padding;
-+};
-+
-+struct fuse_out_header {
-+ __u32 len;
-+ __s32 error;
-+ __u64 unique;
-+};
-+
-+struct fuse_dirent {
-+ __u64 ino;
-+ __u64 off;
-+ __u32 namelen;
-+ __u32 type;
-+ char name[0];
-+};
-+
-+#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
-+#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
-+#define FUSE_DIRENT_SIZE(d) \
-+ FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)
Deleted: trunk/fuse4bsd/debian/patches/004_freebsd_macro.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/004_freebsd_macro.diff 2014-10-05 22:26:12 UTC (rev 5608)
+++ trunk/fuse4bsd/debian/patches/004_freebsd_macro.diff 2014-10-05 22:32:26 UTC (rev 5609)
@@ -1,11 +0,0 @@
---- a/fuse_module/fuse_io.c
-+++ b/fuse_module/fuse_io.c
-@@ -35,7 +35,7 @@
- #include <vm/vnode_pager.h>
- #include <vm/vm_object.h>
-
--#if (__FreeBSD__ >= 8)
-+#if __FreeBSD_version >= 800000
- #define vfs_bio_set_validclean vfs_bio_set_valid
- #endif
-
Deleted: trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff 2014-10-05 22:26:12 UTC (rev 5608)
+++ trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff 2014-10-05 22:32:26 UTC (rev 5609)
@@ -1,13 +0,0 @@
---- a/fuse_module/fuse_main.c
-+++ b/fuse_module/fuse_main.c
-@@ -20,6 +20,10 @@
- #include <sys/buf.h>
- #include <sys/sysctl.h>
-
-+#if __FreeBSD_version >= 1000019
-+#error "kFreeBSD 10.x already provides native FUSE support"
-+#endif
-+
- #include "fuse.h"
-
- static void fuse_bringdown(eventhandler_tag eh_tag);
Modified: trunk/fuse4bsd/debian/patches/series
===================================================================
--- trunk/fuse4bsd/debian/patches/series 2014-10-05 22:26:12 UTC (rev 5608)
+++ trunk/fuse4bsd/debian/patches/series 2014-10-05 22:32:26 UTC (rev 5609)
@@ -1,6 +1,3 @@
000_sbin_mount.diff
-001_ports.diff
+001_kfreebsd-10_api.diff
002_misc.diff
-003_kernel_api.diff
-004_freebsd_macro.diff
-prevent_kfreebsd10_build.diff
More information about the Glibc-bsd-commits
mailing list