X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lib%2Fringbuffer%2Fring_buffer_backend.c;h=c7f2fe9d7b6226b33738d2fbabb379b42999ef93;hb=769b62a02f62ff8db93f109d9f63a1df6ea9990b;hp=83a6e39b4b2df692c955c6930f04d432e4a2c88a;hpb=0112cb7bc68d85c9c98b496937bde7af50f13cc6;p=lttng-modules.git

diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c
index 83a6e39b..c7f2fe9d 100644
--- a/lib/ringbuffer/ring_buffer_backend.c
+++ b/lib/ringbuffer/ring_buffer_backend.c
@@ -28,10 +28,10 @@
 #include <linux/cpu.h>
 #include <linux/mm.h>
 
-#include "../../wrapper/vmalloc.h"	/* for wrapper_vmalloc_sync_all() */
-#include "../../wrapper/ringbuffer/config.h"
-#include "../../wrapper/ringbuffer/backend.h"
-#include "../../wrapper/ringbuffer/frontend.h"
+#include <wrapper/vmalloc.h>	/* for wrapper_vmalloc_sync_all() */
+#include <wrapper/ringbuffer/config.h>
+#include <wrapper/ringbuffer/backend.h>
+#include <wrapper/ringbuffer/frontend.h>
 
 /**
  * lib_ring_buffer_backend_allocate - allocate a channel buffer
@@ -422,6 +422,7 @@ free_bufs:
 		}
 #ifdef CONFIG_HOTPLUG_CPU
 		put_online_cpus();
+		unregister_hotcpu_notifier(&chanb->cpu_hp_notifier);
 #endif
 		free_percpu(chanb->buf);
 	} else
@@ -693,8 +694,7 @@ void _lib_ring_buffer_copy_from_user_inatomic(struct lib_ring_buffer_backend *bu
 							+ (offset & ~PAGE_MASK),
 							src, pagecpy) != 0;
 		if (ret > 0) {
-			offset += (pagecpy - ret);
-			len -= (pagecpy - ret);
+			/* Copy failed. */
 			_lib_ring_buffer_memset(bufb, offset, 0, len, 0);
 			break; /* stop copy */
 		}