Released 2.7.0

diff --git a/ChangeLog b/ChangeLog
index 0e608239c12c1eb60e781956cab1e1e0dbcefb3d..104b16a5661319a1889d887c6acebd6abb66863e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-02  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Released 2.7.0
+
+2007-07-02  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Accept a NULL "op" for fuse_main(), etc.  This is useful if
+       filesystem is only invoking fuse to print a help message, or
+       version.  Fixes RedHat bugzilla #217343
+
 2007-06-22  Miklos Szeredi <miklos@szeredi.hu>
 
        * lib: fix locking when loading a filesystem module

diff --git a/configure.in b/configure.in
index 5c34ef1a60926e5e882f14d13d520428d3590187..962bf04b6d8ce6895cc17f53f09daecae1865354 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.7.0-rc1)
+AC_INIT(fuse, 2.7.0)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)

diff --git a/kernel/configure.ac b/kernel/configure.ac
index ef44a152de6586e1fdd420bf3bbf0dbe93b46ef8..0153d3bf50b2e36a3536c6d9056bae8c8958ab72 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.7.0-rc1)
+AC_INIT(fuse-kernel, 2.7.0)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

diff --git a/lib/fuse.c b/lib/fuse.c
index 69fd737bdda9a115a73f5e6f8ae1cd1f8bc32da8..99e20c3213a00c811ded9b2b04e57ddd1dac77e9 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -3009,7 +3009,8 @@ struct fuse_fs *fuse_fs_new(const struct fuse_operations *op, size_t op_size,
     }
 
     fs->user_data = user_data;
-    memcpy(&fs->op, op, op_size);
+    if (op)
+        memcpy(&fs->op, op, op_size);
     return fs;
 }
 

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 6125f20ecfcc31b505852e58c4ae76c31a6ea66b..9d6642a52ef340bd4e55a0021247494fd96a8b3a 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -150,6 +150,7 @@ FUSE_2.7 {
                fuse_fs_utimens;
                fuse_fs_write;
                fuse_register_module;
+               fuse_reply_iov;
                fuse_version;
 
        local:

diff --git a/test/test.c b/test/test.c
index ead4e174fab511b163542f995f8b4104bbc6d0ff..307f58a4dedfc7f995fc8b92dc96513fe44dbd4e 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -140,7 +140,7 @@ static int check_nlink(const char *path, nlink_t nlink)
         return -1;
     }
     if (stbuf.st_nlink != nlink) {
-        ERROR("nlink %i instead of %i", stbuf.st_nlink, nlink);
+        ERROR("nlink %li instead of %li", stbuf.st_nlink, nlink);
         return -1;
     }
     return 0;