Skip to contentSkip to conversation

mm-swapfilec-remove-the-unneeded-checking.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 17, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/swapfile.c: remove the unneeded checking
has been removed from the -mm tree. Its filename was
mm-swapfilec-remove-the-unneeded-checking.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: Baoquan He <[email protected]>
Subject: mm/swapfile.c: remove the unneeded checking
Date: Wed, 5 Feb 2025 17:27:18 +0800

In free_swap_and_cache_nr(), invocation of get_swap_device() has done the checking if it's a swap entry. So remove the redundant checking here.

---

 mm/swapfile.c |    3 ---
 1 file changed, 3 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swapfilec-remove-the-unneeded-checking +0 -3
@@ -1789,9 +1789,6 @@ void free_swap_and_cache_nr(swp_entry_t
 	bool any_only_cache = false;
 	unsigned long offset;
 
-	if (non_swap_entry(entry))
-		return;
-
 	si = get_swap_device(entry);
 	if (!si)
 		return;

_

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