Remove old symbol versions

diff --git a/lib/fuse.c b/lib/fuse.c
index 3c7f6425a3ec1de41bf83307686e92a654ee6c1a..9f8a116a4a2adc0fe443ddf176b93c5a7dc91e3f 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4284,7 +4284,6 @@ struct fuse_context *fuse_get_context_compat22(void)
 {
        return &fuse_get_context_internal()->ctx;
 }
-FUSE_SYMVER(".symver fuse_get_context_compat22,fuse_get_context@FUSE_2.2");
 
 int fuse_getgroups(int size, gid_t list[])
 {
@@ -4814,13 +4813,6 @@ struct fuse *fuse_new_compat1(int fd, int flags,
                                      11);
 }
 
-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@");
-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@");
-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@");
-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@");
-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@");
-FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2");
-
 #endif /* __FreeBSD__ || __NetBSD__  */
 
 struct fuse *fuse_new_compat25(int fd, struct fuse_args *args,
@@ -4830,5 +4822,3 @@ struct fuse *fuse_new_compat25(int fd, struct fuse_args *args,
        return fuse_new_common_compat25(fd, args, (struct fuse_operations *) op,
                                        op_size, 25);
 }
-
-FUSE_SYMVER(".symver fuse_new_compat25,fuse_new@FUSE_2.5");

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index a259f376c2731f7d109db619c24cd93ab375b4f6..de2046d05d9df97c60af070dc87a94fe3faa06ce 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2211,10 +2211,6 @@ const struct fuse_ctx *fuse_req_ctx_compat24(fuse_req_t req)
 {
        return fuse_req_ctx(req);
 }
-#ifndef __NetBSD__
-FUSE_SYMVER(".symver fuse_req_ctx_compat24,fuse_req_ctx@FUSE_2.4");
-#endif
-
 
 void fuse_req_interrupt_func(fuse_req_t req, fuse_interrupt_func_t func,
                             void *data)
@@ -2937,10 +2933,6 @@ int fuse_sync_compat_args(struct fuse_args *args)
        return 0;
 }
 
-FUSE_SYMVER(".symver fuse_reply_statfs_compat,fuse_reply_statfs@FUSE_2.4");
-FUSE_SYMVER(".symver fuse_reply_open_compat,fuse_reply_open@FUSE_2.4");
-FUSE_SYMVER(".symver fuse_lowlevel_new_compat,fuse_lowlevel_new@FUSE_2.4");
-
 #else /* __FreeBSD__ || __NetBSD__ */
 
 int fuse_sync_compat_args(struct fuse_args *args)
@@ -2962,5 +2954,3 @@ struct fuse_session *fuse_lowlevel_new_compat25(struct fuse_args *args,
                                        (const struct fuse_lowlevel_ops *) op,
                                        op_size, userdata);
 }
-
-FUSE_SYMVER(".symver fuse_lowlevel_new_compat25,fuse_lowlevel_new@FUSE_2.5");

diff --git a/lib/fuse_misc.h b/lib/fuse_misc.h
index eedf0e0f7130b0ceb654dbe45c4d2a0930760d35..f102ba38f8281f59b7e0438da1cc8dfdb718a71e 100644 (file)
--- a/lib/fuse_misc.h
+++ b/lib/fuse_misc.h
@@ -9,17 +9,6 @@
 #include "config.h"
 #include <pthread.h>
 
-/*
-  Versioned symbols cannot be used in some cases because it
-    - confuse the dynamic linker in uClibc
-    - not supported on MacOSX (in MachO binary format)
-*/
-#if (!defined(__UCLIBC__) && !defined(__APPLE__))
-#define FUSE_SYMVER(x) __asm__(x)
-#else
-#define FUSE_SYMVER(x)
-#endif
-
 #ifndef USE_UCLIBC
 #define fuse_mutex_init(mut) pthread_mutex_init(mut, NULL)
 #else

diff --git a/lib/fuse_mt.c b/lib/fuse_mt.c
index f6dbe71b2137a78f2eebbd9df370fe1a74b939f9..fbfa52aed4f9240c2058ec61d8f1740f59513d66 100644 (file)
--- a/lib/fuse_mt.c
+++ b/lib/fuse_mt.c
@@ -118,5 +118,3 @@ int fuse_loop_mt(struct fuse *f)
        fuse_stop_cleanup_thread(f);
        return res;
 }
-
-FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@");

diff --git a/lib/fuse_opt.c b/lib/fuse_opt.c
index a2118cedc38c069facabb670dca3f2ba5ab24504..57499ba625b5221d99950075ea31e6249b2f5577 100644 (file)
--- a/lib/fuse_opt.c
+++ b/lib/fuse_opt.c
@@ -421,6 +421,3 @@ int fuse_opt_parse(struct fuse_args *args, void *data,
        fuse_opt_free_args(&ctx.outargs);
        return res;
 }
-
-/* This symbol version was mistakenly added to the version script */
-FUSE_SYMVER(".symver fuse_opt_insert_arg_compat,fuse_opt_insert_arg@FUSE_2.5");

diff --git a/lib/fuse_session.c b/lib/fuse_session.c
index c55f250747172582028a834a78af8eaf452c6b83..0cbea79024c5fcb67d7d12d1843a5e364f80c74d 100644 (file)
--- a/lib/fuse_session.c
+++ b/lib/fuse_session.c
@@ -227,7 +227,3 @@ void fuse_chan_destroy(struct fuse_chan *ch)
                ch->op.destroy(ch);
        free(ch);
 }
-
-#ifndef __FreeBSD__
-FUSE_SYMVER(".symver fuse_chan_new_compat24,fuse_chan_new@FUSE_2.4");
-#endif

diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
index 8d91887d32a2b7671295ecacb1306a73f7f552fc..f97a5c6218a006babfc7ca83793314f21460ab0d 100644 (file)
--- a/lib/fuse_versionscript
+++ b/lib/fuse_versionscript
@@ -1,4 +1,4 @@
-FUSE_2.2 {
+FUSE_3.0 {
        global:
                fuse_destroy;
                fuse_exit;
@@ -9,19 +9,9 @@ FUSE_2.2 {
                fuse_loop_mt;
                fuse_loop_mt_proc;
                fuse_main;
-               fuse_main_compat1;
-               fuse_main_compat2;
-               fuse_mount_compat1;
-               fuse_new_compat1;
-               fuse_new_compat2;
                fuse_process_cmd;
                fuse_read_cmd;
                fuse_set_getcontext_func;
-               fuse_setup_compat2;
-};
-
-FUSE_2.4 {
-       global:
                fuse_add_dirent;
                fuse_chan_bufsize;
                fuse_chan_data;
@@ -52,14 +42,6 @@ FUSE_2.4 {
                fuse_session_next_chan;
                fuse_session_process;
                fuse_session_reset;
-} FUSE_2.2;
-
-FUSE_2.5 {
-       global:
-               fuse_lowlevel_new_compat;
-               fuse_main_real_compat22;
-               fuse_mount_compat22;
-               fuse_new_compat22;
                fuse_opt_parse;
                fuse_opt_add_opt;
                fuse_opt_add_arg;
@@ -69,45 +51,26 @@ FUSE_2.5 {
                fuse_remove_signal_handlers;
                fuse_reply_create;
                fuse_reply_open;
-               fuse_reply_open_compat;
                fuse_reply_statfs;
-               fuse_reply_statfs_compat;
-               fuse_setup_compat22;
                fuse_set_signal_handlers;
-} FUSE_2.4;
-
-FUSE_2.6 {
-       global:
                fuse_add_direntry;
                fuse_chan_new;
-               fuse_chan_new_compat24;
                fuse_chan_recv;
                fuse_daemonize;
                fuse_get_session;
                fuse_interrupted;
                fuse_lowlevel_new;
-               fuse_lowlevel_new_compat25;
                fuse_main_real;
-               fuse_main_real_compat25;
                fuse_mount;
-               fuse_mount_compat25;
                fuse_new;
-               fuse_new_compat25;
                fuse_opt_insert_arg;
                fuse_reply_lock;
                fuse_req_interrupt_func;
                fuse_req_interrupted;
                fuse_session_remove_chan;
                fuse_setup;
-               fuse_setup_compat25;
                fuse_teardown;
-               fuse_teardown_compat22;
                fuse_unmount;
-               fuse_unmount_compat22;
-} FUSE_2.5;
-
-FUSE_2.7 {
-       global:
                fuse_fs_access;
                fuse_fs_bmap;
                fuse_fs_chmod;
@@ -148,15 +111,7 @@ FUSE_2.7 {
                fuse_register_module;
                fuse_reply_iov;
                fuse_version;
-} FUSE_2.6;
-
-FUSE_2.7.5 {
-       global:
                fuse_reply_bmap;
-} FUSE_2.7;
-
-FUSE_2.8 {
-       global:
                cuse_lowlevel_new;
                cuse_lowlevel_main;
                cuse_lowlevel_setup;
@@ -178,10 +133,6 @@ FUSE_2.8 {
                fuse_req_ctx;
                fuse_req_getgroups;
                fuse_session_data;
-} FUSE_2.7.5;
-
-FUSE_2.9 {
-       global:
                fuse_buf_copy;
                fuse_buf_size;
                fuse_fs_read_buf;
@@ -196,12 +147,8 @@ FUSE_2.9 {
                fuse_clean_cache;
                fuse_lowlevel_notify_delete;
                fuse_fs_flock;
-} FUSE_2.8;
-
-FUSE_2.9.1 {
-       global:
                fuse_fs_fallocate;
 
        local:
                *;
-} FUSE_2.9;
+};

diff --git a/lib/helper.c b/lib/helper.c
index ace19dd7098bf50027c22c7a6aae5b3c455b58bf..98180be45fa657d77d3cb23f29df2de2eab79ebd 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -434,12 +434,6 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[])
        return fuse_mount_compat22(mountpoint, NULL);
 }
 
-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@");
-FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@");
-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@");
-FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2");
-
 #endif /* __FreeBSD__ || __NetBSD__ */
 
 
@@ -471,8 +465,3 @@ int fuse_mount_compat25(const char *mountpoint, struct fuse_args *args)
 {
        return fuse_kern_mount(mountpoint, args);
 }
-
-FUSE_SYMVER(".symver fuse_setup_compat25,fuse_setup@FUSE_2.5");
-FUSE_SYMVER(".symver fuse_teardown_compat22,fuse_teardown@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_main_real_compat25,fuse_main_real@FUSE_2.5");
-FUSE_SYMVER(".symver fuse_mount_compat25,fuse_mount@FUSE_2.5");

diff --git a/lib/mount.c b/lib/mount.c
index 6a9da9eefd5641fc2b790738a1e739525016e5b5..125a0df2b1713d17a3bf8d58081c8e7d4598da24 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -631,6 +631,3 @@ out:
        free(mo.mtab_opts);
        return res;
 }
-
-FUSE_SYMVER(".symver fuse_mount_compat22,fuse_mount@FUSE_2.2");
-FUSE_SYMVER(".symver fuse_unmount_compat22,fuse_unmount@FUSE_2.2");

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index 62443ac25f99d4a83d7c1748a8049f12faee76c0..9ee74fb14b628fceb8556f06d7911c234b4c990b 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -384,5 +384,3 @@ out:
        free(mo.kernel_opts);
        return res;
 }
-
-FUSE_SYMVER(".symver fuse_unmount_compat22,fuse_unmount@FUSE_2.2");