The patch titled
Subject: mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3
has been removed from the -mm tree. Its filename was
mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3.patch
This patch was dropped because it was folded into mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v2.patch
------------------------------------------------------
From: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Subject: mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3
- Make congestion state per-cgroup-per-node instead of just per-cgroup.
(Shakeel)
- Changelog update. (Shakeel)
Link: http://lkml.kernel.org/r/20180406180254.8970-2-aryabinin@xxxxxxxxxxxxx
Signed-off-by: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Reviewed-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN mm/vmscan.c~mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3 mm/vmscan.c
--- a/mm/vmscan.c~mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v3
+++ a/mm/vmscan.c
@@ -205,22 +205,22 @@ static void set_memcg_congestion(pg_data
struct mem_cgroup *memcg,
bool congested)
{
- struct mem_cgroup_per_node *mz;
+ struct mem_cgroup_per_node *mn;
if (!memcg)
return;
- mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
- WRITE_ONCE(mz->congested, congested);
+ mn = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
+ WRITE_ONCE(mn->congested, congested);
}
static bool memcg_congested(pg_data_t *pgdat,
struct mem_cgroup *memcg)
{
- struct mem_cgroup_per_node *mz;
+ struct mem_cgroup_per_node *mn;
- mz = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
- return READ_ONCE(mz->congested);
+ mn = mem_cgroup_nodeinfo(memcg, pgdat->node_id);
+ return READ_ONCE(mn->congested);
}
#else
@@ -2615,8 +2615,7 @@ static bool shrink_node(pg_data_t *pgdat
* immediate reclaim and stall if any are encountered
* in the nr_immediate check below.
*/
- if (sc->nr.writeback &&
- sc->nr.writeback == sc->nr.file_taken)
+ if (sc->nr.writeback && sc->nr.writeback == sc->nr.taken)
set_bit(PGDAT_WRITEBACK, &pgdat->flags);
/*
_
Patches currently in -mm which might be from aryabinin@xxxxxxxxxxxxx are
mm-vmscan-update-stale-comments.patch
mm-vmscan-remove-redundant-current_may_throttle-check.patch
mm-vmscan-dont-change-pgdat-state-on-base-of-a-single-lru-list-state-v2.patch
mm-vmscan-dont-mess-with-pgdat-flags-in-memcg-reclaim-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
