mm-page_alloc-only-enforce-watermarks-for-order-0-allocations-fix-fix

simplify __zone_watermark_ok(), per Vlastimil

Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Vitaly Wool <vitalywool@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 33e9a23be1e88facedf886dad06f9d4a74a3ca20..d9073df717c5b109c7e7cd16241a663fe921f875 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2377,11 +2377,8 @@ static bool __zone_watermark_ok(struct zone *z, unsigned int order,
                if (!area->nr_free)
                        continue;
 
-               if (alloc_harder) {
-                       if (area->nr_free)
-                               return true;
-                       continue;
-               }
+               if (alloc_harder)
+                       return true;
 
                for (mt = 0; mt < MIGRATE_PCPTYPES; mt++) {
                        if (!list_empty(&area->free_list[mt]))