summaryrefslogtreecommitdiff
path: root/sysutils/fusefs-kmod/files/patch-fuse_io.c
diff options
context:
space:
mode:
authorAlejandro Pulver <alepulver@FreeBSD.org>2008-02-16 18:05:38 +0000
committerAlejandro Pulver <alepulver@FreeBSD.org>2008-02-16 18:05:38 +0000
commit6b3f87a53a44256b4798be8583f2e7e044b3b083 (patch)
treecf8972f085c92501fea6358bcbeed45845b3493a /sysutils/fusefs-kmod/files/patch-fuse_io.c
parentThis plugin provides many convenient functions (diff)
From [1]:
- Update to version 0.3.9-pre1.20080208 (agreed with author). - Download directly from the Mercurial reposirory (as tarball), to ease maintainence. - Remove all local patches as they were integrated. - Convert setup.sh into setup.sh.in, and use SUB_FILES instead of manual replacement. - Use kldload instead of rc.d script in setup.sh.in because the latter gives an error. - Remove "sleep 1" from rc.d script as now the FUSE daemon makes umount wait until disks are synced (synchronous unmount). - Update pkg-message. From [2]: - Pass SRC_BASE to the actual build (previously was only used by the port to detect if the source was installed, but not passed to the internal Makefile). PR: ports/120420 [1], ports/118112 [2] Submitted by: alepulver [1], Yuri Pankov <yuri.pankov@gmail.com> [2] Approved by: maintainer (timeout) [1], maintainer [2]
Diffstat (limited to 'sysutils/fusefs-kmod/files/patch-fuse_io.c')
-rw-r--r--sysutils/fusefs-kmod/files/patch-fuse_io.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_io.c b/sysutils/fusefs-kmod/files/patch-fuse_io.c
deleted file mode 100644
index 11797d848847..000000000000
--- a/sysutils/fusefs-kmod/files/patch-fuse_io.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- fuse_module/fuse_io.c.orig 2007-06-19 16:35:22.000000000 +0400
-+++ fuse_module/fuse_io.c 2008-01-20 20:47:05.000000000 +0300
-@@ -139,7 +139,11 @@
- struct vnode *vp = fp->f_vnode;
- int err = 0;
-
-+#if __FreeBSD_version > 800009
-+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-+#else
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
-+#endif
-
- ASSERT_VOP_LOCKED__FH(vp);
- if (_file_is_bad(fp) || ! _file_is_fat(fp)) {
-@@ -148,7 +152,7 @@
- }
-
- if (uio->uio_resid == 0)
-- return (0);
-+ goto out;
-
- if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {
- if ((err = VOP_GETATTR(vp, &va, cred, td)))
-@@ -166,7 +170,11 @@
- fp->f_nextoff = uio->uio_offset;
-
- out:
-+#if __FreeBSD_version > 800009
-+ VOP_UNLOCK(vp, 0);
-+#else
- VOP_UNLOCK(vp, 0, td);
-+#endif
-
- DEBUG("leaving with %d\n", err);
- return (err);