5 files changed, 48 insertions, 4 deletions

diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
index 05b934aad0de..03bf5e1c11db 100644
--- a/sysutils/fusefs-kmod/Makefile
+++ b/sysutils/fusefs-kmod/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fusefs
 DISTVERSION=	0.3.9-pre1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kld
 MASTER_SITES=	http://fuse4bsd.creo.hu/downloads/ \
 		http://am-productions.biz/docs/
diff --git a/sysutils/fusefs-kmod/files/fusefs.in b/sysutils/fusefs-kmod/files/fusefs.in
index c6eb33661ca6..62fd25827654 100644
--- a/sysutils/fusefs-kmod/files/fusefs.in
+++ b/sysutils/fusefs-kmod/files/fusefs.in
@@ -25,13 +25,31 @@ stop_cmd="fusefs_stop"
 
 fusefs_start()
 {
+	if kldstat | grep -q fuse\\.ko; then
+		echo "${name} is already running."
+		return 0
+	fi
 	echo "Starting ${name}."
 	kldload $kmod
 }
 
 fusefs_stop()
 {
+	if ! kldstat | grep -q fuse\\.ko; then
+		echo "${name} is not running."
+		return 1
+	fi
 	echo "Stopping ${name}."
+# Unmount FUSE filesystems in reverse order (in case they are nested) with
+# a delay of one second after, to allow 'umount' finish.
+	mount | sed -e '1!G;h;$!d' | while read dev d1 mountpoint d2; do
+		case "$dev" in
+		/dev/fuse[0-9]*)
+			echo "fusefs: unmounting ${mountpoint}."
+			umount $mountpoint ; sleep 1
+			;;
+		esac
+	done
 	kldunload $kmod
 }
 load_rc_config $name
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_io.c b/sysutils/fusefs-kmod/files/patch-fuse_io.c
new file mode 100644
index 000000000000..4d8abbd5ec26
--- /dev/null
+++ b/sysutils/fusefs-kmod/files/patch-fuse_io.c
@@ -0,0 +1,11 @@
+--- fuse_module/fuse_io.c.orig	Tue Jun 19 09:35:22 2007
++++ fuse_module/fuse_io.c	Thu Dec 13 02:46:05 2007
+@@ -148,7 +148,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)))
diff --git a/sysutils/fusefs-kmod/files/patch-mount_fusefs-mount_fusefs.c b/sysutils/fusefs-kmod/files/patch-mount_fusefs-mount_fusefs.c
index b5f3e946c72b..dad69c8ea9b0 100644
--- a/sysutils/fusefs-kmod/files/patch-mount_fusefs-mount_fusefs.c
+++ b/sysutils/fusefs-kmod/files/patch-mount_fusefs-mount_fusefs.c
@@ -1,6 +1,15 @@
---- mount_fusefs/mount_fusefs.c	Sat Jul 14 13:12:09 2007
-+++ mount_fusefs/mount_fusefs.c	Sat Jul 14 13:12:09 2007
-@@ -469,7 +469,8 @@ showversion(void)
+--- mount_fusefs/mount_fusefs.c.orig	Tue Jun 19 09:35:22 2007
++++ mount_fusefs/mount_fusefs.c	Thu Dec 13 02:44:12 2007
+@@ -70,6 +70,8 @@
+ 	{ "user_id=",            0, 0x00, 1 },
+ 	{ "group_id=",           0, 0x00, 1 },
+ 	{ "large_read",          0, 0x00, 1 },
++	/* "nonempty", just the first two chars are stripped off during parsing */
++	{ "nempty",              0, 0x00, 1 },
+ 	MOPT_STDOPTS,
+ 	MOPT_END
+ };
+@@ -469,7 +471,8 @@
  int
  init_backgrounded(void)
  {
@@ -9,3 +18,4 @@
 +	size_t len;
  
  	len = sizeof(ibg);
+ 
diff --git a/sysutils/fusefs-kmod/files/pkg-message.in b/sysutils/fusefs-kmod/files/pkg-message.in
index 3b7c8d73c7e7..81b4143ab9e7 100644
--- a/sysutils/fusefs-kmod/files/pkg-message.in
+++ b/sysutils/fusefs-kmod/files/pkg-message.in
@@ -12,4 +12,9 @@ Now fuse filesystems (sysutils/fusefs-*) can be mounted at startup from
 /etc/fstab with the "late" parameter. This requires a symlink in /usr/sbin
 named "mount_<fstype>", which is not created by all the fusefs ports.
 
+Note that the rc.d script will unmount all fuse filesystems when called with
+"stop", so it can unload the kernel module, and as a temporary workaround to
+flush cache in drivers like NTFS-3G (sysutils/fusefs-ntfs) at shutdown (until
+a proper solution is implemented).
+
 ==============================================================================