+ mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4.patch added to mm-new branch

+ mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4.patch added to mm-new branch

[Andrew Morton]

The patch titled
     Subject: mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4
has been added to the -mm mm-new branch.  Its filename is
     mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4.patch

This patch will later appear in the mm-new branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Note, mm-new is a provisional staging ground for work-in-progress
patches, and acceptance into mm-new is a notification for others take
notice and to finish up reviews.  Please do not hesitate to respond to
review feedback and post updated versions to replace or incrementally
fixup patches in mm-new.

The mm-new branch of mm.git is not included in linux-next

If a few days of testing in mm-new is successful, the patch will me moved
into mm.git's mm-unstable branch, which is included in linux-next

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days

------------------------------------------------------
From: Hui Zhu <zhuhui@kylinos.cn>
Subject: mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4
Date: Wed, 11 Mar 2026 10:22:41 +0800

remove redundant comment, per Barry

Link: https://lkml.kernel.org/r/20260311022241.177801-1-hui.zhu@linux.dev
Signed-off-by: Hui Zhu <zhuhui@kylinos.cn>
Reviewed-by: Youngjun Park <youngjun.park@lge.com>
Reviewed-by: Barry Song <baohua@kernel.org>
Acked-by: Chris Li <chrisl@kernel.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Kemeng Shi <shikemeng@huaweicloud.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/swapfile.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- a/mm/swapfile.c~mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4
+++ a/mm/swapfile.c
@@ -623,10 +623,8 @@ static struct swap_cluster_info *isolate
 	spin_unlock(&si->lock);
 
 	if (found && !cluster_table_is_alloced(found)) {
-		/* Table of non-free cluster must be allocated. */
-		VM_WARN_ON_ONCE(flags != CLUSTER_FLAG_FREE);
-
 		/* Only an empty free cluster's swap table can be freed. */
+		VM_WARN_ON_ONCE(flags != CLUSTER_FLAG_FREE);
 		VM_WARN_ON_ONCE(list != &si->free_clusters);
 		VM_WARN_ON_ONCE(!cluster_is_empty(found));
 		return swap_cluster_alloc_table(si, found);
_

Patches currently in -mm which might be from zhuhui@kylinos.cn are

mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation.patch
mm-swap-strengthen-locking-assertions-and-invariants-in-cluster-allocation-v4.patch