Merge branch 'master' of git://git.lttng.org/lttng-tools

[lttng-tools.git] / src / common / consumer.c

diff --git a/src/common/consumer.c b/src/common/consumer.c
index d7b319452a87088eab5d6cd648fd7515e5b387f5..05bf85b3dc8d8e73e0bbe62497a64bf0f0bc3e26 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -19,7 +19,6 @@
 
 #define _GNU_SOURCE
 #include <assert.h>
 
 #define _GNU_SOURCE
 #include <assert.h>

-#include <fcntl.h>

 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>


@@ -644,7 +643,7 @@ void lttng_consumer_sync_trace_file(
        if (orig_offset < stream->chan->max_sb_size) {
                return;
        }
        if (orig_offset < stream->chan->max_sb_size) {
                return;
        }

-       sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+       lttng_sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,

                        stream->chan->max_sb_size,
                        SYNC_FILE_RANGE_WAIT_BEFORE
                        | SYNC_FILE_RANGE_WRITE
                        stream->chan->max_sb_size,
                        SYNC_FILE_RANGE_WAIT_BEFORE
                        | SYNC_FILE_RANGE_WRITE


@@ -812,6 +811,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
                ERR("Unknown consumer_data type");
                assert(0);
        }
                ERR("Unknown consumer_data type");
                assert(0);
        }

+
+       return 0;

 }
 
 /*
 }
 
 /*