X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Frelay.c;h=27794f9e5e2070358d2658b1ab0fa86336d56fc9;hb=c8b4275ed4a63a4bc374a9f3dc864725882c750e;hp=530a4960fb45dfe945a7e55abbc1116aa7817efc;hpb=769d015768372ce7f68ff12bbc55aa339c3a6bcd;p=lttng-ust.git

diff --git a/libust/relay.c b/libust/relay.c
index 530a4960..27794f9e 100644
--- a/libust/relay.c
+++ b/libust/relay.c
@@ -29,7 +29,7 @@
 //#include "list.h"
 #include "relay.h"
 #include "channels.h"
-#include "kref.h"
+#include <kcompat/kref.h>
 #include "tracer.h"
 #include "tracercore.h"
 #include "usterr.h"
@@ -1537,7 +1537,7 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
 	result = ltt_chan->buf_shmid = shmget(getpid(), size, IPC_CREAT | IPC_EXCL | 0700);
 	if(ltt_chan->buf_shmid == -1) {
 		PERROR("shmget");
-		return -1;
+		return;
 	}
 
 	ptr = shmat(ltt_chan->buf_shmid, NULL, 0);
@@ -1552,12 +1552,12 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
 	result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
 	if(result == -1) {
 		perror("shmctl");
-		return -1;
+		return;
 	}
 
 	ltt_chan->buf = ptr;
 
-	return 0;
+	return;
 
 	destroy_shmem:
 	result = shmctl(ltt_chan->buf_shmid, IPC_RMID, NULL);
@@ -1565,7 +1565,7 @@ static void ltt_chan_alloc_ltt_buf(struct ltt_channel_struct *ltt_chan)
 		perror("shmctl");
 	}
 
-	return -1;
+	return;
 }
 
 /*