fix

diff --git a/ChangeLog b/ChangeLog
index ceed29adbf89c8ffbae0937ea1e249cab087f8b6..72d93af0d7f8fb857e782081e75ec9b9c140a4d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,22 +2,28 @@
 
        * Separate configure for the kernel directory
 
-       * Add pkg-config support.  To compile a FUSE based filesystem you
-       can do  "gcc -Wall `pkg-config --cflags --libs fuse` myfs.c -o myfs"
-       or similar.  Note, that the PKG_CONFIG_PATH environment variable
-       usually needs to be set to "/usr/local/lib/pkgconfig".
-
 2004-11-09  Miklos Szeredi <miklos@szeredi.hu>
 
        * Split 2.0 branch
 
        * Fix 'makeconf.sh' to use autoreconf if available
 
+2004-11-08  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Add pkg-config support.  To compile a FUSE based filesystem you
+       can do  "gcc -Wall `pkg-config --cflags --libs fuse` myfs.c -o myfs"
+       or similar.  Note, that the PKG_CONFIG_PATH environment variable
+       usually needs to be set to "/usr/local/lib/pkgconfig".
+
 2004-11-01  Miklos Szeredi <miklos@szeredi.hu>
 
        * Fix compile problems with ancient (<=2.4.18) kernels (reported
        by Jeremy Smith)
 
+       * Add "allow_root" mount option.  Patch by Yaroslav Rastrigin
+
+       * Clear the 'exited' flag when mail loop is finished
+
 2004-10-28  Miklos Szeredi <miklos@szeredi.hu>
 
        * Make xattr functions work under 2.6 (bug found by Vincenzo
@@ -613,7 +619,7 @@
 
 2003-03-10  Miklos Szeredi <miklos@szeredi.hu>
 
-       * Fix umount oops (found by Samuli Kärkkäinen)
+       * Fix umount oops (found by Samuli Kärkkäinen)
 
 2003-03-05  Miklos Szeredi <miklos@szeredi.hu>
 

diff --git a/Makefile.am b/Makefile.am
index 140691ebf7b0108b48d2ebb680750450551d7b4f..aaf50981a9fa66526d5e0c48b4c8e51ba699640e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = @subdirs@ @subdirs2@
 
 EXTRA_DIST =                   \
-       fuse.spec               \
+       fuse.pc.in              \
        README*                 \
        Filesystems             \
        BUGS                    \

diff --git a/kernel/linux/fuse.h b/kernel/linux/fuse.h
index 21ecc47f6375ef536990783dc29f7186a4a35ee3..9c08b601d6597389f3532ea9910891a3efd8b380 100644 (file)
--- a/kernel/linux/fuse.h
+++ b/kernel/linux/fuse.h
@@ -9,7 +9,7 @@
 /* This file defines the kernel interface of FUSE */
 
 /** Version number of this interface */
-#define FUSE_KERNEL_VERSION 3
+#define FUSE_KERNEL_VERSION 4
 
 /** Minor version number of this interface */
 #define FUSE_KERNEL_MINOR_VERSION 1
@@ -24,6 +24,7 @@
 #define FUSE_VERSION_FILE "/proc/fs/fuse/version"
 
 struct fuse_attr {
+       unsigned long       _user_ino; /* unused, for forward compatibility */
        unsigned int        mode;
        unsigned int        nlink;
        unsigned int        uid;
@@ -213,6 +214,7 @@ struct fuse_user_header {
        int unique; /* zero */
        enum fuse_opcode opcode;
        unsigned long ino;
+       unsigned long _user_ino;  /* unused, for forward compatibility */
 };
 
 struct fuse_dirent {