diff options
Diffstat (limited to 'sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c')
| -rw-r--r-- | sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c b/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c index 8237ec4ed4e7..3f6654095dc7 100644 --- a/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c +++ b/sysutils/fusefs-kmod/files/patch-fuse_module__fuse_vnops.c @@ -1,5 +1,5 @@ ---- 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; @@ -13,7 +13,34 @@ 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)) { @@ -26,7 +53,7 @@ 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.") */ @@ -38,7 +65,7 @@ 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; |