summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2007-07-02 11:29:19 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2007-07-02 11:29:19 +0000
commitd4428a57bc961d0ec23626cb066735ebb70b0621 (patch)
treed6edceebcff3912d4905c9318721e56fa3c45508
parent37fb19c74ffed25e2dbb0ec3f84c560ff69e5fad (diff)
downloadfuse-d4428a57bc961d0ec23626cb066735ebb70b0621.tar.gz
Released 2.7.0fuse_2_7_0
-rw-r--r--ChangeLog10
-rw-r--r--configure.in2
-rw-r--r--kernel/configure.ac2
-rw-r--r--lib/fuse.c3
-rw-r--r--lib/fuse_versionscript1
-rw-r--r--test/test.c2
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 <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 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;