--- Filesystem.orig	2011-08-25 23:20:04.000000000 +0200
+++ Filesystem	2011-08-28 11:51:00.101691214 +0200
@@ -236,7 +236,7 @@
 	# Get the current real device name, if possible.
 	# (specified devname could be -L or -U...)
 	case "$FSTYPE" in
-	nfs|smbfs|cifs|none) ;;
+	nfs|smbfs|cifs|none|tmpfs) ;;
 	*)	DEVICE=`list_mounts | grep " $MOUNTPOINT " | cut -d' ' -f1`
 		if [ -b "$DEVICE" ]; then
 		  blockdevice=yes
@@ -417,7 +417,7 @@
 	    no)    false;;
 	    ""|auto)
 		case $FSTYPE in
-		    ext4|ext4dev|ext3|reiserfs|reiser4|nss|xfs|jfs|vfat|fat|nfs|cifs|smbfs|ocfs2|gfs2|none|lustre)
+		    tmpfs|ext4|ext4dev|ext3|reiserfs|reiser4|nss|xfs|jfs|vfat|fat|nfs|cifs|smbfs|ocfs2|gfs2|none|lustre)
 			false;;
 		    *)
 			true;;
@@ -461,8 +461,11 @@
 		if [ -z "$FSTYPE" -o "$FSTYPE" = none ]; then
 			: No FSTYPE specified, rely on the system has the right file-system support already 
 		else
-			# Insert Filesystem module
-			$MODPROBE $FSTYPE >/dev/null 
+			grep -e "$FSTYPE"'$' /proc/filesystems >/dev/null
+			if [ $? -ne 0 ] ; then
+				# Insert Filesystem module
+				$MODPROBE $FSTYPE >/dev/null 
+			fi
 			grep -e "$FSTYPE"'$' /proc/filesystems >/dev/null
 			if [ $? -ne 0 ] ; then
 				ocf_log err "Couldn't find filesystem $FSTYPE in /proc/filesystems"
@@ -972,6 +975,8 @@
 	;;
 //[!/]*/*)	# An SMB filesystem specification...
 	;;
+none)
+	;;
 /dev/null)	# Special case for BSC
 	blockdevice=yes
 	;;