Skip to contentSkip to conversation

lib-stackdepot-simplify-__stack_depot_save.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 11, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/stackdepot: simplify __stack_depot_save
has been removed from the -mm tree. Its filename was
lib-stackdepot-simplify-__stack_depot_save.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: lib/stackdepot: simplify __stack_depot_save
Date: Mon, 20 Nov 2023 18:47:01 +0100

The retval local variable in __stack_depot_save has the union type handle_parts, but the function never uses anything but the union's handle field.

Define retval simply as depot_stack_handle_t to simplify the code.

---

 lib/stackdepot.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
lib/stackdepot.c renamed from lib/stackdepot.c~lib-stackdepot-simplify-__stack_depot_save +4 -5
@@ -366,7 +366,7 @@ depot_stack_handle_t __stack_depot_save(
 					gfp_t alloc_flags, bool can_alloc)
 {
 	struct stack_record *found = NULL, **bucket;
-	union handle_parts retval = { .handle = 0 };
+	depot_stack_handle_t handle = 0;
 	struct page *page = NULL;
 	void *prealloc = NULL;
 	unsigned long flags;
@@ -383,7 +383,7 @@ depot_stack_handle_t __stack_depot_save(
 	nr_entries = filter_irq_stacks(entries, nr_entries);
 
 	if (unlikely(nr_entries == 0) || stack_depot_disabled)
-		goto fast_exit;
+		return 0;
 
 	hash = hash_stack(entries, nr_entries);
 	bucket = &stack_table[hash & stack_hash_mask];
@@ -449,9 +449,8 @@ exit:
 		free_pages((unsigned long)prealloc, DEPOT_POOL_ORDER);
 	}
 	if (found)
-		retval.handle = found->handle.handle;
-fast_exit:
-	return retval.handle;
+		handle = found->handle.handle;
+	return handle;
 }
 EXPORT_SYMBOL_GPL(__stack_depot_save);
 

_

Patches currently in -mm which might be from [email protected] are