revert to version 2.6

diff --git a/configure.in b/configure.in
index 4e29570f9dab2325f163c33f2b23d30517b4d37a..b0a5ed23187fcd868000b24f756655d3a44f0323 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.7.0-pre0)
+AC_INIT(fuse, 2.6.0-pre0)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)

diff --git a/include/fuse.h b/include/fuse.h
index 3c3a98f4b3ea3b6fb04a817299fe1245ec34c8ad..a7182acdbd3c76dc465e12c2e0a9e31730d83f8b 100644 (file)
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -547,7 +547,7 @@ void fuse_set_getcontext_func(struct fuse_context *(*func)(void));
 #  undef FUSE_MINOR_VERSION
 #  undef fuse_main
 #  if FUSE_USE_VERSION == 25
-#    define FUSE_MINOR_VERSION 6
+#    define FUSE_MINOR_VERSION 5
 #    define fuse_main(argc, argv, op) \
             fuse_main_real_compat25(argc, argv, op, sizeof(*(op)))
 #    define fuse_new fuse_new_compat25
@@ -590,7 +590,7 @@ void fuse_set_getcontext_func(struct fuse_context *(*func)(void));
 #      define FUSE_DEBUG FUSE_DEBUG_COMPAT1
 #    endif
 #  endif
-#elif FUSE_USE_VERSION < 27
+#elif FUSE_USE_VERSION < 26
 #  error Compatibility with API version other than 21, 22, 25 and 11 not supported
 #endif
 

diff --git a/include/fuse_common.h b/include/fuse_common.h
index 4304462b821cf8baf5b4fdc548fc6a8d6577f46f..191b6f9b8f9e53f045d03560cca27f15a10931ec 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -20,7 +20,7 @@
 #define FUSE_MAJOR_VERSION 2
 
 /** Minor version of FUSE library interface */
-#define FUSE_MINOR_VERSION 7
+#define FUSE_MINOR_VERSION 6
 
 #define FUSE_MAKE_VERSION(maj, min)  ((maj) * 10 + (min))
 #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION)

diff --git a/include/fuse_lowlevel.h b/include/fuse_lowlevel.h
index 0c4672f06afc7359a892da60db1c09fc6ff7cec8..83389277bc3dca4821a71de0e8bb81dfe8d0ffa2 100644 (file)
--- a/include/fuse_lowlevel.h
+++ b/include/fuse_lowlevel.h
@@ -1245,7 +1245,7 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
 #  include "fuse_lowlevel_compat.h"
 #  undef FUSE_MINOR_VERSION
 #  if FUSE_USE_VERSION == 25
-#    define FUSE_MINOR_VERSION 6
+#    define FUSE_MINOR_VERSION 5
 #    define fuse_lowlevel_ops fuse_lowlevel_ops_compat25
 #    define fuse_lowlevel_new fuse_lowlevel_new_compat25
 #  else
@@ -1254,7 +1254,7 @@ void fuse_remove_signal_handlers(struct fuse_session *se);
 #    define fuse_reply_statfs fuse_reply_statfs_compat
 #    define fuse_reply_open fuse_reply_open_compat
 #  endif
-#elif FUSE_USE_VERSION < 27
+#elif FUSE_USE_VERSION < 26
 #  error Compatibility with low level API version other than 24 and 25 not supported
 #endif
 

diff --git a/kernel/configure.ac b/kernel/configure.ac
index cdb26699d504bbe9c6206ee45b967f83c6f28a04..50a7a2228f6922f2d2d75676d2359914efd38110 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.7.0-pre0)
+AC_INIT(fuse-kernel, 2.6.0-pre0)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 366fcb0b32c7512774e97c4c9268f7674babf29a..e0fbfb05ca1c47978167940e25297121defac82f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@ libfuse_la_SOURCES =          \
        helper.c                \
        $(mount_source)
 
-libfuse_la_LDFLAGS = -lpthread -version-number 2:7:0 \
+libfuse_la_LDFLAGS = -lpthread -version-number 2:6:0 \
        -Wl,--version-script,fuse_versionscript
 
 EXTRA_DIST = fuse_versionscript

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 421228e1ac03b84b9026f3467b56e3612bf3414a..6e0ab1367e85aafcaacbcbf729eed2b87174cafa 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -84,11 +84,6 @@ FUSE_2.5 {
 } FUSE_2.4;
 
 FUSE_2.6 {
-       global:
-               fuse_opt_insert_arg;
-} FUSE_2.5;
-
-FUSE_2.7 {
        global:
                fuse_lowlevel_new;
                fuse_lowlevel_new_compat25;
@@ -96,9 +91,7 @@ FUSE_2.7 {
                fuse_main_real_compat25;
                fuse_new;
                fuse_new_compat25;
+               fuse_opt_insert_arg;
                fuse_setup;
                fuse_setup_compat25;
-
-       local:
-                *;
-} FUSE_2.6;
+} FUSE_2.5;