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

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

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 20d0405a3b40e8d828c883dd3b57606583e2d770..8dec2d78366af35793e56797c0db537fcfd6bc6a 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -19,19 +19,20 @@
 
 #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 <string.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/socket.h>

+#include <sys/stat.h>

 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-ctl.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-ctl.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>

+#include <common/compat/fcntl.h>

 
 #include "ust-consumer.h"
 
 
 #include "ust-consumer.h"
 


@@ -71,7 +72,7 @@ ssize_t lttng_ustconsumer_on_read_subbuffer_mmap(
                        goto end;
                }
                /* This won't block, but will start writeout asynchronously */
                        goto end;
                }
                /* This won't block, but will start writeout asynchronously */

-               sync_file_range(outfd, stream->out_fd_offset, ret,
+               lttng_sync_file_range(outfd, stream->out_fd_offset, ret,

                                SYNC_FILE_RANGE_WRITE);
                stream->out_fd_offset += ret;
        }
                                SYNC_FILE_RANGE_WRITE);
                stream->out_fd_offset += ret;
        }