Index: head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse.h
===================================================================
--- head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse.h	(revision 222232)
+++ head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse.h	(revision 222233)
@@ -1,17 +1,32 @@
---- fuse_module/fuse.h.orig	2008-09-26 12:40:20.000000000 -0400
-+++ fuse_module/fuse.h	2008-09-26 12:41:54.000000000 -0400
-@@ -49,6 +49,14 @@
+--- fuse_module/fuse.h.orig	2008-02-05 00:25:57.000000000 -0500
++++ fuse_module/fuse.h	2008-10-29 19:18:43.000000000 -0400
+@@ -25,6 +25,14 @@
+ #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 +57,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

Property changes on: head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse.h
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c
===================================================================
--- head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c	(revision 222232)
+++ head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c	(revision 222233)
@@ -1,53 +1,80 @@
---- fuse_module/fuse_vnops.c.orig	2008-02-05 13:25:57.000000000 +0800
-+++ fuse_module/fuse_vnops.c	2008-10-19 13:31:53.000000000 +0800
+--- fuse_module/fuse_vnops.c.orig	2008-02-05 00:25:57.000000000 -0500
++++ fuse_module/fuse_vnops.c	2008-10-29 19:21:51.000000000 -0400
 @@ -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;
-@@ -946,7 +949,11 @@
+@@ -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 +1936,11 @@
+@@ -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 +3016,11 @@
+@@ -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;

Property changes on: head/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property