From d4428a57bc961d0ec23626cb066735ebb70b0621 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Mon, 2 Jul 2007 11:29:19 +0000 Subject: [PATCH] Released 2.7.0 --- ChangeLog | 10 ++++++++++ configure.in | 2 +- kernel/configure.ac | 2 +- lib/fuse.c | 3 ++- lib/fuse_versionscript | 1 + test/test.c | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e60823..104b16a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-07-02 Miklos Szeredi + + * Released 2.7.0 + +2007-07-02 Miklos Szeredi + + * 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 * lib: fix locking when loading a filesystem module diff --git a/configure.in b/configure.in index 5c34ef1..962bf04 100644 --- 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 ef44a15..0153d3b 100644 --- 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 69fd737..99e20c3 100644 --- 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 6125f20..9d6642a 100644 --- 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 ead4e17..307f58a 100644 --- 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; -- 2.11.4.GIT