mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup.patch removed from -mm tree
The quilt patch titled
Subject: mm: swap_cgroup: get rid of __lookup_swap_cgroup()
has been removed from the -mm tree. Its filename was
mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup.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: Roman Gushchin <[email protected]>
Subject: mm: swap_cgroup: get rid of __lookup_swap_cgroup()
Date: Fri, 15 Nov 2024 19:02:29 +0000
Because swap_cgroup map is now virtually contiguous, swap_cgroup_record() can be simplified, which eliminates a need to use __lookup_swap_cgroup().
Now as __lookup_swap_cgroup() is really trivial and is used only once, it can be inlined.
---
mm/swap_cgroup.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
mm/swap_cgroup.c renamed from mm/swap_cgroup.c~mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup +2 -16
@@ -33,13 +33,6 @@ static struct swap_cgroup_ctrl swap_cgro* * TODO: we can push these buffers out to HIGHMEM. */ - -static struct swap_cgroup *__lookup_swap_cgroup (struct swap_cgroup_ctrl *ctrl, -pgoff_t offset) -{ -return &ctrl->map[offset]; -} -static struct swap_cgroup *lookup_swap_cgroup (swp_entry_t ent,struct swap_cgroup_ctrl **ctrlp) {
@@ -49,7 +42,7 @@ static struct swap_cgroup *lookup_swap_c ctrl = &swap_cgroup_ctrl[swp_type (ent)];if (ctrlp) *ctrlp = ctrl; -return __lookup_swap_cgroup (ctrl, offset); +return &ctrl->map[offset]; }/**
@@ -104,16 +97,9 @@ unsigned short swap_cgroup_record(swp_enspin_lock_irqsave (&ctrl->lock, flags); old = sc->id; -for (;;) { +for (; offset < end; offset++, sc++) {VM_BUG_ON (sc->id != old); sc->id = id; - offset++; -if (offset == end) -break ; -if (offset %SC_PER_PAGE ) - sc++; -else - sc =__lookup_swap_cgroup (ctrl, offset); }spin_unlock_irqrestore (&ctrl->lock, flags);
_
Patches currently in -mm which might be from [email protected] are