| Message ID | 20240206191355.83755-1-nphamcs@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] mm/swap_state: update zswap LRU's protection range with the folio locked (fix) | expand |
On Tue, Feb 06, 2024 at 11:13:55AM -0800, Nhat Pham wrote: > The if (folio) checks inside zswap_folio_swapin() is no longer needed. > > Suggested-by: Johannes Weiner <hannes@cmpxchg.org> > Signed-off-by: Nhat Pham <nphamcs@gmail.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
diff --git a/mm/zswap.c b/mm/zswap.c index 8c548f73d52e..e91e3f10a5c8 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -826,11 +826,9 @@ void zswap_folio_swapin(struct folio *folio) { 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); } void zswap_memcg_offline_cleanup(struct mem_cgroup *memcg)
The if (folio) checks inside zswap_folio_swapin() is no longer needed. Suggested-by: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Nhat Pham <nphamcs@gmail.com> --- mm/zswap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)