new version

diff --git a/Makefile.am b/Makefile.am
index a7cf071ee059039f6de67396bb1c413578bf0a9d..422dd294005eeacc3b437b91157033194922ee85 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,5 @@
 SUBDIRS = @subdirs@
 
 EXTRA_DIST =                   \
-       fuse.spec
+       fuse.spec               \
+       README*

diff --git a/NEWS b/NEWS
index 98383709e23e768ccf2983ab161b1ce4e7d83f14..8d86fceadacb6fa0d8e64502dcc9c46f0bc7f4a7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+What is new in 1.1
+
+* Support for the 2.6 kernels
+
+* Read efficiency improvements: read in 64k blocks instead of 4k
+(Michael Grigoriev)
+
+* Lazy automatic unmount
+
+* Added 'fsync()' VFS call to the FUSE interface
+
+* Bugfixes
+
+
 What is new in 1.0
 
 * Cleanups and bugfixes

diff --git a/configure.in b/configure.in
index d64cd524f3ce0368bb0b48751294adddd7492f81..359dc68e3c243ec9baeb56338ee7dc625716740f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(lib/fuse.c)
-AM_INIT_AUTOMAKE(fuse, 1.0)
+AM_INIT_AUTOMAKE(fuse, 1.1-pre1)
 AM_CONFIG_HEADER(include/config.h)
 
 AC_PROG_CC

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index f1bf8a197a3877983eaf5dd4ac25c314d68a4058..4015069e7488f80be49f3347013b3871ea8a7ce9 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -5,7 +5,6 @@ INSTALL = @INSTALL@
 mkinstalldirs = $(SHELL) ../mkinstalldirs
 majver = @majver@
 
-EXTRA_CFLAGS := -I$(PWD)/../include
 DISTFILES = Makefile.in dev.c dir.c file.c inode.c util.c fuse_i.h
 
 fusemoduledir = @kmoduledir@/kernel/fs/fuse
@@ -44,7 +43,7 @@ ifeq ($(majver), 2.4)
 CC = @CC@
 LD = @LD@
 CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe
-CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES
+CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"@VERSION@\"
 
 fuse_objs = dev.o dir.o file.o inode.o util.o
 
@@ -68,6 +67,8 @@ util.o: $(fuse_headers)
 
 else
 
+EXTRA_CFLAGS := -I$(PWD)/../include -DFUSE_VERSION=\"@VERSION@\"
+
 obj-m := fuse.o
 fuse-objs := dev.o dir.o file.o inode.o util.o
 

diff --git a/kernel/util.c b/kernel/util.c
index 7296517626b25a1d021f1b664bc10005d46e2239..67641576fd86886f3c43bb827aa306ad76bb60f5 100644 (file)
--- a/kernel/util.c
+++ b/kernel/util.c
@@ -31,7 +31,9 @@ int __init fuse_init(void)
 {
        int res;
 
-       printk(KERN_DEBUG "fuse init (version %i)\n", FUSE_KERNEL_VERSION);
+       printk(KERN_DEBUG "fuse init %s (API version %i.%i)\n",
+              FUSE_VERSION,
+              FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
 
        res = fuse_fs_init();
        if(res)