[v2,2/2] Rename kmemleak_initialized to kmemleak_late_initialized

Commit Message

xiaolei wang Aug. 15, 2023, 5:13 a.m. UTC

kmemleak_initialized is set in kmemleak_late_init()
instead of kmemleak_init(), which may cause confusion,
so rename kmemleak_initialized to kmemleak_late_initialized.

Signed-off-by: Xiaolei Wang <[e-mail]>
---
 mm/kmemleak.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Catalin Marinas Aug. 15, 2023, 10:40 a.m. UTC | #1

On Tue, Aug 15, 2023 at 01:13:58PM +0800, Xiaolei Wang wrote:
> kmemleak_initialized is set in kmemleak_late_init()
> instead of kmemleak_init(), which may cause confusion,
> so rename kmemleak_initialized to kmemleak_late_initialized.
> 
> Signed-off-by: Xiaolei Wang <[e-mail]>

If it makes it clearer, fine by me.

Acked-by: Catalin Marinas <[e-mail]>

Patch

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 04bb4cdbb402..5c8e5a24b890 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -218,7 +218,7 @@  static int kmemleak_enabled = 1;
 /* same as above but only for the kmemleak_free() callback */
 static int kmemleak_free_enabled = 1;
 /* set in the late_initcall if there were no errors */
-static int kmemleak_initialized;
+static int kmemleak_late_initialized;
 /* set if a kmemleak warning was issued */
 static int kmemleak_warning;
 /* set if a fatal kmemleak error has occurred */
@@ -2053,7 +2053,7 @@  static void kmemleak_disable(void)
 	kmemleak_enabled = 0;
 
 	/* check whether it is too early for a kernel thread */
-	if (kmemleak_initialized)
+	if (kmemleak_late_initialized)
 		schedule_work(&cleanup_work);
 	else
 		kmemleak_free_enabled = 0;
@@ -2118,7 +2118,7 @@  void __init kmemleak_init(void)
  */
 static int __init kmemleak_late_init(void)
 {
-	kmemleak_initialized = 1;
+	kmemleak_late_initialized = 1;
 
 	debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops);
 
@@ -2126,7 +2126,7 @@  static int __init kmemleak_late_init(void)
 		/*
 		 * Some error occurred and kmemleak was disabled. There is a
 		 * small chance that kmemleak_disable() was called immediately
-		 * after setting kmemleak_initialized and we may end up with
+		 * after setting kmemleak_late_initialized and we may end up with
 		 * two clean-up threads but serialized by scan_mutex.
 		 */
 		schedule_work(&cleanup_work);