Updated to libfuse 2.7.3.

git-svn-id: http://macfuse.googlecode.com/svn/trunk@776 febdc8c4-1326-0410-abd6-27cb15717650

Author: Amit Singh

ChangeLog

@@ -1,3 +1,43 @@
+2008-02-19  Miklos Szeredi <[email protected]>
+
+	* Released 2.7.3
+
+2008-02-13  Miklos Szeredi <[email protected]>
+
+	* Add missing bdi_init() and bdi_destroy() calls for 2.6.24
+	kernel.  Lack of bdi_init() could cause write to hang.  Report
+	forwarded by Szakacsits Szabolcs from the NTFS-3G forum.
+
+2008-02-03  Csaba Henk <[email protected]>
+
+	* lib/mount_bsd.c:
+	- string formatting fixes
+	- exit if mounting has failed
+	  (in FreeBSD a mount failure is not critical per se, as the daemon
+	  still could be mounted externally, but waiting for such an event
+	  is more confusing than fruitful)
+	- ditch the kvm(8) stuff and simply use forced unmount which just
+	  won't block
+	- prettify option specifications
+	- add "-onosync_unmount" kernel option
+
+2008-01-07  Csaba Henk <[email protected]>
+
+	* lib/mount_bsd.c:
+	- refine device closing in a race-free way
+	- add support for "-osubtype" on FreeBSD
+
+	* makeconf.sh: make it work under FreeBSD
+
+2008-01-03  Csaba Henk <[email protected]>
+
+	* lib/mount_bsd.c: close device before unmount
+	(cf. lib/mount.c rev. 1.43) and fix some warnings 
+
+2007-12-23  Miklos Szeredi <[email protected]>
+
+	* Fix './configure --disable-static'.  Patch from Ismail Dönmez
+
 2007-12-17  Miklos Szeredi <[email protected]>
 
 	* Released 2.7.2

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse 2.7.2.
+# Generated by GNU Autoconf 2.61 for fuse 2.7.3.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='fuse'
 PACKAGE_TARNAME='fuse'
-PACKAGE_VERSION='2.7.2'
-PACKAGE_STRING='fuse 2.7.2'
+PACKAGE_VERSION='2.7.3'
+PACKAGE_STRING='fuse 2.7.3'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1407,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fuse 2.7.2 to adapt to many kinds of systems.
+\`configure' configures fuse 2.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1478,7 +1478,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fuse 2.7.2:";;
+     short | recursive ) echo "Configuration of fuse 2.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,7 +1586,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-fuse configure 2.7.2
+fuse configure 2.7.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1600,7 +1600,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fuse $as_me 2.7.2, which was
+It was created by fuse $as_me 2.7.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2416,7 +2416,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='fuse'
- VERSION='2.7.2'
+ VERSION='2.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21402,7 +21402,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by fuse $as_me 2.7.2, which was
+This file was extended by fuse $as_me 2.7.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21455,7 +21455,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fuse config.status 2.7.2
+fuse config.status 2.7.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.7.2)
+AC_INIT(fuse, 2.7.3)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)
@@ -76,7 +76,7 @@ AC_ARG_WITH([libiconv-prefix],
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
    ])
-AM_ICONV
+#AM_ICONV
 libfuse_libs="$libfuse_libs $LIBICONV"
 AM_CONDITIONAL(ICONV, test "$am_cv_func_iconv" = yes)
 AC_SUBST(libfuse_libs)

kernel/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse-kernel 2.7.2.
+# Generated by GNU Autoconf 2.61 for fuse-kernel 2.7.3.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='fuse-kernel'
 PACKAGE_TARNAME='fuse-kernel'
-PACKAGE_VERSION='2.7.2'
-PACKAGE_STRING='fuse-kernel 2.7.2'
+PACKAGE_VERSION='2.7.3'
+PACKAGE_STRING='fuse-kernel 2.7.3'
 PACKAGE_BUGREPORT=''
 
 ac_subst_vars='SHELL
@@ -1130,7 +1130,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures fuse-kernel 2.7.2 to adapt to many kinds of systems.
+\`configure' configures fuse-kernel 2.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1191,7 +1191,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of fuse-kernel 2.7.2:";;
+     short | recursive ) echo "Configuration of fuse-kernel 2.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1266,7 +1266,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-fuse-kernel configure 2.7.2
+fuse-kernel configure 2.7.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1280,7 +1280,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by fuse-kernel $as_me 2.7.2, which was
+It was created by fuse-kernel $as_me 2.7.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2487,7 +2487,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by fuse-kernel $as_me 2.7.2, which was
+This file was extended by fuse-kernel $as_me 2.7.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2536,7 +2536,7 @@ Report bugs to <[email protected]>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-fuse-kernel config.status 2.7.2
+fuse-kernel config.status 2.7.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

kernel/configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.7.2)
+AC_INIT(fuse-kernel, 2.7.3)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

kernel/inode.c

@@ -470,6 +470,13 @@ static struct fuse_conn *new_conn(void)
 
 	fc = kzalloc(sizeof(*fc), GFP_KERNEL);
 	if (fc) {
+#ifdef KERNEL_2_6_24_PLUS
+		int err = bdi_init(&fc->bdi);
+		if (err) {
+			kfree(fc);
+			return NULL;
+		}
+#endif
 		spin_lock_init(&fc->lock);
 		mutex_init(&fc->inst_mutex);
 		atomic_set(&fc->count, 1);
@@ -496,6 +503,9 @@ void fuse_conn_put(struct fuse_conn *fc)
 		if (fc->destroy_req)
 			fuse_request_free(fc->destroy_req);
 		mutex_destroy(&fc->inst_mutex);
+#ifdef KERNEL_2_6_24_PLUS
+		bdi_destroy(&fc->bdi);
+#endif
 		kfree(fc);
 	}
 }

lib/Makefile.am

@@ -51,7 +51,7 @@ libfuse_la_SOURCES = 		\
 	$(mount_source)
 
 if !DARWIN
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:7:2 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:7:3 \
 	-Wl,--version-script,$(srcdir)/fuse_versionscript
 endif
 

lib/Makefile.in

@@ -246,7 +246,7 @@ libfuse_la_SOURCES = \
 	$(iconv_source)		\
 	$(mount_source)
 
-@DARWIN_FALSE@libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:7:2 \
+@DARWIN_FALSE@libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:7:3 \
 @DARWIN_FALSE@	-Wl,--version-script,$(srcdir)/fuse_versionscript
 
 libulockmgr_la_SOURCES = ulockmgr.c

lib/fuse.c

@@ -2923,21 +2923,21 @@ static const struct fuse_opt fuse_lib_opts[] = {
 static void fuse_lib_help(void)
 {
 	fprintf(stderr,
-"    -o hard_remove	    immediate removal (don't hide files)\n"
-"    -o use_ino		    let filesystem set inode numbers\n"
-"    -o readdir_ino	    try to fill in d_ino in readdir\n"
-"    -o direct_io	    use direct I/O\n"
-"    -o kernel_cache	    cache files in kernel\n"
-"    -o [no]auto_cache	    enable caching based on modification times\n"
-"    -o umask=M		    set file permissions (octal)\n"
-"    -o uid=N		    set file owner\n"
-"    -o gid=N		    set file group\n"
-"    -o entry_timeout=T	    cache timeout for names (1.0s)\n"
+"    -o hard_remove         immediate removal (don't hide files)\n"
+"    -o use_ino             let filesystem set inode numbers\n"
+"    -o readdir_ino         try to fill in d_ino in readdir\n"
+"    -o direct_io           use direct I/O\n"
+"    -o kernel_cache        cache files in kernel\n"
+"    -o [no]auto_cache      enable caching based on modification times (off)\n"
+"    -o umask=M             set file permissions (octal)\n"
+"    -o uid=N               set file owner\n"
+"    -o gid=N               set file group\n"
+"    -o entry_timeout=T     cache timeout for names (1.0s)\n"
 "    -o negative_timeout=T  cache timeout for deleted names (0.0s)\n"
-"    -o attr_timeout=T	    cache timeout for attributes (1.0s)\n"
+"    -o attr_timeout=T      cache timeout for attributes (1.0s)\n"
 "    -o ac_attr_timeout=T   auto cache timeout for attributes (attr_timeout)\n"
-"    -o intr		    allow requests to be interrupted\n"
-"    -o intr_signal=NUM	    signal to send on interrupt (%i)\n"
+"    -o intr                allow requests to be interrupted\n"
+"    -o intr_signal=NUM     signal to send on interrupt (%i)\n"
 "    -o modules=M1[:M2...]  names of modules to push onto filesystem stack\n"
 "\n", FUSE_DEFAULT_INTR_SIGNAL);
 }

lib/fuse_lowlevel.c

@@ -1218,10 +1218,11 @@ static void fuse_ll_version(void)
 static void fuse_ll_help(void)
 {
 	fprintf(stderr,
-"    -o max_write=N	    set maximum size of write requests\n"
-"    -o max_readahead=N	    set maximum readahead\n"
-"    -o async_read	    perform reads asynchronously (default)\n"
-"    -o sync_read	    perform reads synchronously\n");
+"    -o max_write=N         set maximum size of write requests\n"
+"    -o max_readahead=N     set maximum readahead\n"
+"    -o async_read          perform reads asynchronously (default)\n"
+"    -o sync_read           perform reads synchronously\n"
+"    -o atomic_o_trunc      enable atomic open+truncate support\n");
 }
 
 static int fuse_ll_opt_proc(void *data, const char *arg, int key,

lib/helper.c

@@ -65,19 +65,19 @@ static void usage(const char *progname)
 		"usage: %s mountpoint [options]\n\n", progname);
 	fprintf(stderr,
 		"general options:\n"
-		"    -o opt,[opt...]	    mount options\n"
-		"    -h	  --help	    print help\n"
-		"    -V	  --version	    print version\n"
+		"    -o opt,[opt...]        mount options\n"
+		"    -h   --help            print help\n"
+		"    -V   --version         print version\n"
 		"\n");
 }
 
 static void helper_help(void)
 {
 	fprintf(stderr,
 		"FUSE options:\n"
-		"    -d	  -o debug	    enable debug output (implies -f)\n"
-		"    -f			    foreground operation\n"
-		"    -s			    disable multi-threaded operation\n"
+		"    -d   -o debug          enable debug output (implies -f)\n"
+		"    -f                     foreground operation\n"
+		"    -s                     disable multi-threaded operation\n"
 		"\n"
 		);
 }

lib/mount.c

@@ -108,14 +108,14 @@ static const struct fuse_opt fuse_mount_opts[] = {
 static void mount_help(void)
 {
 	fprintf(stderr,
-"    -o allow_other	    allow access to other users\n"
-"    -o allow_root	    allow access to root\n"
-"    -o nonempty	    allow mounts over non-empty file/dir\n"
+"    -o allow_other         allow access to other users\n"
+"    -o allow_root          allow access to root\n"
+"    -o nonempty            allow mounts over non-empty file/dir\n"
 "    -o default_permissions enable permission checking by kernel\n"
-"    -o fsname=NAME	    set filesystem name\n"
-"    -o subtype=NAME	    set filesystem type\n"
-"    -o large_read	    issue large read requests (2.4 only)\n"
-"    -o max_read=N	    set maximum size of read requests\n"
+"    -o fsname=NAME         set filesystem name\n"
+"    -o subtype=NAME        set filesystem type\n"
+"    -o large_read          issue large read requests (2.4 only)\n"
+"    -o max_read=N          set maximum size of read requests\n"
 "\n");
 }