merge bugfixes up to merge3

diff --git a/ChangeLog b/ChangeLog
index 0a287314730eff63192a94c2dccbb0f42ea28d07..eb701b6339763a5b54b06277683fa412b45694d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,35 @@
+2007-03-14  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Released 2.7.0-pre1
+
 2007-03-05  Miklos Szeredi <miklos@szeredi.hu>
 
        * Correctly handle O_APPEND in direct IO mode.  Reported by Greg
        Bruno
 
+       * mount.fuse should use /bin/bash.  Debian Bug#413403.  Reported
+       by Thomas Weinbrenner
+
+2007-02-26  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix detection of installed fuse in init script.  Reported and
+       fix suggested by Davide Canova
+
+2007-02-05  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Fix 2.6.9 RHEL kernels, which have compatibility mutex.h, but
+       don't define mutex_destroy(), bummer.  Patch from Phil Schwan
+
+2007-02-04  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Released 2.6.3
+
+2007-02-04  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Compile fuseblk for kernels which don't have an option to turn
+       off the block layer (CONFIG_BLOCK).  Reported by Szakacsits
+       Szabolcs
+
 2007-02-03  Miklos Szeredi <miklos@szeredi.hu>
 
        * Add filesystem stacking support to high level API.  Filesystem

diff --git a/configure.in b/configure.in
index b2ef187baacf6c420b6684c53e5114e94c8ed500..1ea4edf87d94058ea2634fb496b58ac1aea5a272 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.7.0-pre0)
+AC_INIT(fuse, 2.7.0-pre1)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)

diff --git a/kernel/configure.ac b/kernel/configure.ac
index eb8a4fa902b9f04373d7aa76908a3acffceeb6ed..115c42891ba81aefd7ef645f128a1429b69db81e 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.7.0-pre0)
+AC_INIT(fuse-kernel, 2.7.0-pre1)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL
@@ -193,6 +193,13 @@ if test "$ENABLE_FUSE_MODULE" = y; then
        else
                AC_MSG_RESULT([no])
        fi
+       AC_MSG_CHECKING([if kernel has BLOCK option ])
+       if test -f $kernelsrc/block/Kconfig && egrep -wq "config *BLOCK" $kernelsrc/block/Kconfig; then
+               AC_DEFINE(HAVE_CONFIG_BLOCK, 1, [kernel has BLOCK option])
+               AC_MSG_RESULT([yes])
+       else
+               AC_MSG_RESULT([no])
+       fi
 
        isuml=no
        KERNELMAKE_PARAMS=

diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h
index f4e2ece01bd1e9b993b383891f492e637b38f658..e3aad476cad8bef6b31ae3d47767d1ab567f1a3a 100644 (file)
--- a/kernel/fuse_i.h
+++ b/kernel/fuse_i.h
@@ -67,12 +67,19 @@
 #define mutex semaphore
 #endif
 #ifndef HAVE_I_MUTEX
+#ifndef mutex_destroy
+/* Some RHEL kernels include a backported mutex.h, which lacks mutex_destroy */
+#define mutex_destroy(m) do { } while (0)
+#endif
 #define i_mutex i_sem  /* Hack for struct inode */
 #endif
 #ifndef KERNEL_2_6_19_PLUS
 #define clear_nlink(inode) (inode)->i_nlink = 0
 #define inc_nlink(inode) (inode)->i_nlink++
 #endif
+#ifndef HAVE_CONFIG_BLOCK
+#define CONFIG_BLOCK
+#endif
 
 /** Max number of pages that can be used in a single read request */
 #define FUSE_MAX_PAGES_PER_REQ 32

diff --git a/util/init_script b/util/init_script
index ed964cbc7fb6e99c6262ca9488f55b3f47123067..0ca395f9c583bffadee658c880d203d2de0735c5 100755 (executable)
--- a/util/init_script
+++ b/util/init_script
@@ -12,7 +12,7 @@ DESC="FUSE"
 MOUNTPOINT=/sys/fs/fuse/connections
 
 # Gracefully exit if the package has been removed.
-test -x `which fusermount` || exit 0
+which fusermount &>/dev/null || exit 0
 
 error()
 {

diff --git a/util/mount.fuse b/util/mount.fuse
index 1d87d1f17911151415959cf51b06baa19883dba6..c4ff72fae634ed9e4f806b3584e48b19e9f03407 100644 (file)
--- a/util/mount.fuse
+++ b/util/mount.fuse
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # FUSE mount helper
 # Petr Klima <qaxi@seznam.cz>