mm, vmscan: move lru_lock to the node

Node-based reclaim requires node-based LRUs and locking.  This is a
preparation patch that just moves the lru_lock to the node so later
patches are easier to review.  It is a mechanical change but note this
patch makes contention worse because the LRU lock is hotter and direct
reclaim and kswapd can contend on the same lock even when reclaiming
from different zones.

Link: http://lkml.kernel.org/r/1467970510-21195-3-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index 45eaa2a56517..5c65fad3f330 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -752,7 +752,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                  * if contended.
                  */
                 if (!(low_pfn % SWAP_CLUSTER_MAX)
-                    && compact_unlock_should_abort(&zone->lru_lock, flags,
+                    && compact_unlock_should_abort(zone_lru_lock(zone), flags,
                                                                 &locked, cc))
                         break;
 
@@ -813,7 +813,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                         if (unlikely(__PageMovable(page)) &&
                                         !PageIsolated(page)) {
                                 if (locked) {
-                                        spin_unlock_irqrestore(&zone->lru_lock,
+                                        spin_unlock_irqrestore(zone_lru_lock(zone),
                                                                         flags);
                                         locked = false;
                                 }
@@ -836,7 +836,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
 
                 /* If we already hold the lock, we can skip some rechecking */
                 if (!locked) {
-                        locked = compact_trylock_irqsave(&zone->lru_lock,
+                        locked = compact_trylock_irqsave(zone_lru_lock(zone),
                                                                 &flags, cc);
                         if (!locked)
                                 break;
@@ -899,7 +899,7 @@ isolate_fail:
                  */
                 if (nr_isolated) {
                         if (locked) {
-                                spin_unlock_irqrestore(&zone->lru_lock, flags);
+                                spin_unlock_irqrestore(zone_lru_lock(zone), flags);
                                 locked = false;
                         }
                         acct_isolated(zone, cc);
@@ -927,7 +927,7 @@ isolate_fail:
                 low_pfn = end_pfn;
 
         if (locked)
-                spin_unlock_irqrestore(&zone->lru_lock, flags);
+                spin_unlock_irqrestore(zone_lru_lock(zone), flags);
 
         /*
          * Update the pageblock-skip information and cached scanner pfn,