Skip to contentSkip to conversation

mm-workingset-simplify-lockdep-check-in-update_node.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 13, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: workingset: simplify lockdep check in update_node
has been removed from the -mm tree. Its filename was
mm-workingset-simplify-lockdep-check-in-update_node.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: Pedro Falcato <[email protected]>
Subject: mm: workingset: simplify lockdep check in update_node
Date: Mon, 21 Apr 2025 18:16:28 +0100

container_of(node->array, ..., i_pages) just to access i_pages again is an incredibly roundabout way of accessing node->array itself. Simplify it.

---

 mm/workingset.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/workingset.c renamed from mm/workingset.c~mm-workingset-simplify-lockdep-check-in-update_node +1 -3
@@ -612,7 +612,6 @@ struct list_lru shadow_nodes;
 
 void workingset_update_node(struct xa_node *node)
 {
-	struct address_space *mapping;
 	struct page *page = virt_to_page(node);
 
 	/*
@@ -623,8 +622,7 @@ void workingset_update_node(struct xa_no
 	 * already where they should be. The list_empty() test is safe
 	 * as node->private_list is protected by the i_pages lock.
 	 */
-	mapping = container_of(node->array, struct address_space, i_pages);
-	lockdep_assert_held(&mapping->i_pages.xa_lock);
+	lockdep_assert_held(&node->array->xa_lock);
 
 	if (node->count && node->count == node->nr_values) {
 		if (list_empty(&node->private_list)) {

_

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