From c319299a028c5dba8c2a413acc35f930f4b72cbc Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 14:22:27 -0400
Subject: [PATCH] wrapper: remove mm.h wrapper

---
 lib/ringbuffer/ring_buffer_backend.c | 10 ++--
 wrapper/mm.h                         | 70 ----------------------------
 2 files changed, 5 insertions(+), 75 deletions(-)
 delete mode 100644 wrapper/mm.h

diff --git a/lib/ringbuffer/ring_buffer_backend.c b/lib/ringbuffer/ring_buffer_backend.c
index 435129cf..a9b9acd7 100644
--- a/lib/ringbuffer/ring_buffer_backend.c
+++ b/lib/ringbuffer/ring_buffer_backend.c
@@ -15,8 +15,8 @@
 #include <linux/cpu.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
+#include <linux/oom.h>
 
-#include <wrapper/mm.h>
 #include <wrapper/ringbuffer/config.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
@@ -51,7 +51,7 @@ int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config
 	 * and returns if there should be enough free pages based on the
 	 * current estimate.
 	 */
-	if (!wrapper_check_enough_free_pages(num_pages))
+	if (num_pages >= si_mem_available())
 		goto not_enough_pages;
 
 	/*
@@ -60,7 +60,7 @@ int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config
 	 * end up running out of memory because of this buffer allocation, we
 	 * want to kill the offending app first.
 	 */
-	wrapper_set_current_oom_origin();
+	set_current_oom_origin();
 
 	num_pages_per_subbuf = num_pages >> get_count_order(num_subbuf);
 	subbuf_size = chanb->subbuf_size;
@@ -150,7 +150,7 @@ int lib_ring_buffer_backend_allocate(const struct lib_ring_buffer_config *config
 		}
 	}
 
-	wrapper_clear_current_oom_origin();
+	clear_current_oom_origin();
 	vfree(pages);
 	return 0;
 
@@ -167,7 +167,7 @@ depopulate:
 array_error:
 	vfree(pages);
 pages_error:
-	wrapper_clear_current_oom_origin();
+	clear_current_oom_origin();
 not_enough_pages:
 	return -ENOMEM;
 }
diff --git a/wrapper/mm.h b/wrapper/mm.h
deleted file mode 100644
index e4bc4035..00000000
--- a/wrapper/mm.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/mm.h
- *
- * Copyright (C) 2018 Francis Deslauriers <francis.deslauriers@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_MM_H
-#define _LTTNG_WRAPPER_MM_H
-
-#include <linux/mm.h>
-#include <linux/oom.h>
-
-#include <lttng-kernel-version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) \
-		|| LTTNG_UBUNTU_KERNEL_RANGE(4,4,25,44, 4,5,0,0))
-
-/*
- * Returns true if the current estimation of the number of page available is
- * larger than the number of pages passed as parameter.
- */
-static inline
-bool wrapper_check_enough_free_pages(unsigned long num_pages)
-{
-	return num_pages < si_mem_available();
-}
-
-#else
-
-static inline
-bool wrapper_check_enough_free_pages(unsigned long num_pages)
-{
-	/*
-	 * The si_mem_available function is not available on this kernel. Since
-	 * we can't reliably know if there is enough memory available, so we
-	 * return true.
-	 */
-	return true;
-}
-#endif
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-static inline
-void wrapper_set_current_oom_origin(void)
-{
-	return set_current_oom_origin();
-}
-
-static inline
-void wrapper_clear_current_oom_origin(void)
-{
-	return clear_current_oom_origin();
-}
-
-#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-
-static inline
-void wrapper_set_current_oom_origin(void)
-{
-	return;
-}
-
-static inline
-void wrapper_clear_current_oom_origin(void)
-{
-	return;
-}
-#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */
-#endif /* _LTTNG_WRAPPER_MM_H */
-- 
2.34.1