diff options
| author |  Miklos Szeredi <miklos@szeredi.hu> | 2007-03-14 09:32:00 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2007-03-14 09:32:00 +0000 |
| commit | 2a53c580b730fd657af004bde995e1c2eefe6234 (patch) | |
| tree | 41d8df2748fb75a65feb142871b0244bfb3aebfa | |
| parent | 2f759e1950e3908eb48fc000e88e0159649d8632 (diff) | |
merge bugfixes up to merge3
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | kernel/configure.ac | 9 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 7 | ||||
| -rwxr-xr-x | util/init_script | 2 | ||||
| -rw-r--r-- | util/mount.fuse | 2 |
6 files changed, 45 insertions, 4 deletions
@@ -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 b2ef187..1ea4edf 100644 --- 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 eb8a4fa..115c428 100644 --- 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 f4e2ece..e3aad47 100644 --- 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 ed964cb..0ca395f 100755 --- 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 1d87d1f..c4ff72f 100644 --- a/util/mount.fuse +++ b/util/mount.fuse @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # FUSE mount helper # Petr Klima <qaxi@seznam.cz> |