directly call fuse_new_31() instead of fuse_new() internally

this fixes building with lto, which failed since commit 503e32d01e4db00e90d7acfd81ab05386559069f

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 882e6f0226699dd793d7b5e98e5612aa9c910296..ee1941eface4b00d0d96df7feb6041e6099172fd 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -9,6 +9,8 @@ Unreleased Changes
 
 * Fixed installation directory for udev rules.  
 
+* Fixed compilation with LTO.
+
 libfuse 3.1.1 (2017-08-06)
 ==========================
 

diff --git a/lib/fuse.c b/lib/fuse.c
index 2322a8b388269954041548a1c9491301b7ec6e13..b0130725022c56113c7203eb533bf67c28391a9b 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -4629,8 +4629,6 @@ void fuse_stop_cleanup_thread(struct fuse *f)
 
 /* Explicit prototype to prevent compiler warnings
    (fuse.h only defines fuse_new()) */
-struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
-                     size_t op_size, void *private_data);
 FUSE_SYMVER(".symver fuse_new_31,fuse_new@@FUSE_3.1");
 struct fuse *fuse_new_31(struct fuse_args *args,
                      const struct fuse_operations *op,

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index 54466f6dc1604305c334a52ab6350db3cd31790f..80849ec8182f5fbf8e7da549395a84760d40b392 100644 (file)
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -125,3 +125,6 @@ int fuse_session_receive_buf_int(struct fuse_session *se, struct fuse_buf *buf,
                                 struct fuse_chan *ch);
 void fuse_session_process_buf_int(struct fuse_session *se,
                                  const struct fuse_buf *buf, struct fuse_chan *ch);
+
+struct fuse *fuse_new_31(struct fuse_args *args, const struct fuse_operations *op,
+                     size_t op_size, void *private_data);

diff --git a/lib/helper.c b/lib/helper.c
index 9abc6dda41110a119f90931d9a06891e60a21691..9d26c1461174f13df74b5faa9183fdf1eb4ed083 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -302,7 +302,7 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op,
        }
 
 
-       fuse = fuse_new(&args, op, op_size, user_data);
+       fuse = fuse_new_31(&args, op, op_size, user_data);
        if (fuse == NULL) {
                res = 1;
                goto out1;