The quilt patch titled
Subject: mm/swap_state: update zswap LRU's protection range with the folio locked (fix)
has been removed from the -mm tree. Its filename was
mm-swap_state-update-zswap-lrus-protection-range-with-the-folio-locked-fix.patch
This patch was dropped because it was folded into mm-swap_state-update-zswap-lrus-protection-range-with-the-folio-locked.patch
------------------------------------------------------
From: Nhat Pham <nphamcs@xxxxxxxxx>
Subject: mm/swap_state: update zswap LRU's protection range with the folio locked (fix)
Date: Tue, 6 Feb 2024 11:13:55 -0800
The if (folio) checks inside zswap_folio_swapin() is no longer needed.
Link: https://lkml.kernel.org/r/20240206191355.83755-1-nphamcs@xxxxxxxxx
Suggested-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Nhat Pham <nphamcs@xxxxxxxxx>
Cc: Chengming Zhou <chengming.zhou@xxxxxxxxx>
Cc: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/zswap.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- a/mm/zswap.c~mm-swap_state-update-zswap-lrus-protection-range-with-the-folio-locked-fix
+++ a/mm/zswap.c
@@ -377,11 +377,9 @@ void zswap_folio_swapin(struct folio *fo
{
struct lruvec *lruvec;
- if (folio) {
- VM_WARN_ON_ONCE(!folio_test_locked(folio));
- lruvec = folio_lruvec(folio);
- atomic_long_inc(&lruvec->zswap_lruvec_state.nr_zswap_protected);
- }
+ VM_WARN_ON_ONCE(!folio_test_locked(folio));
+ lruvec = folio_lruvec(folio);
+ atomic_long_inc(&lruvec->zswap_lruvec_state.nr_zswap_protected);
}
/*********************************
_
Patches currently in -mm which might be from nphamcs@xxxxxxxxx are
mm-swap_state-update-zswap-lrus-protection-range-with-the-folio-locked.patch
mm-cachestat-fix-folio-read-after-free-in-cache-walk.patch
selftests-zswap-add-zswap-selftest-file-to-zswap-maintainer-entry.patch
selftests-fix-the-zswap-invasive-shrink-test.patch
selftests-add-zswapin-and-no-zswap-tests.patch
