Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1601863

[PATCH 15/15] mm: page_alloc: Move logical continuations to EOL

Show all headers | View raw

Just more code style conformance/neatening.

Signed-off-by: Joe Perches <joe@perches.com>
---
 mm/page_alloc.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 930773b03b26..011a8e057639 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -859,9 +859,9 @@ static inline void __free_one_page(struct page *page,
 			buddy = page + (buddy_pfn - pfn);
 			buddy_mt = get_pageblock_migratetype(buddy);
 
-			if (migratetype != buddy_mt
-			    && (is_migrate_isolate(migratetype) ||
-				is_migrate_isolate(buddy_mt)))
+			if (migratetype != buddy_mt &&
+			    (is_migrate_isolate(migratetype) ||
+			     is_migrate_isolate(buddy_mt)))
 				goto done_merging;
 		}
 		max_order++;
@@ -2115,8 +2115,9 @@ static void reserve_highatomic_pageblock(struct page *page, struct zone *zone,
 
 	/* Yoink! */
 	mt = get_pageblock_migratetype(page);
-	if (!is_migrate_highatomic(mt) && !is_migrate_isolate(mt)
-	    && !is_migrate_cma(mt)) {
+	if (!is_migrate_highatomic(mt) &&
+	    !is_migrate_isolate(mt) &&
+	    !is_migrate_cma(mt)) {
 		zone->nr_reserved_highatomic += pageblock_nr_pages;
 		set_pageblock_migratetype(page, MIGRATE_HIGHATOMIC);
 		move_freepages_block(zone, page, MIGRATE_HIGHATOMIC, NULL);
@@ -2682,8 +2683,9 @@ int __isolate_free_page(struct page *page, unsigned int order)
 		for (; page < endpage; page += pageblock_nr_pages) {
 			int mt = get_pageblock_migratetype(page);
 
-			if (!is_migrate_isolate(mt) && !is_migrate_cma(mt)
-			    && !is_migrate_highatomic(mt))
+			if (!is_migrate_isolate(mt) &&
+			    !is_migrate_cma(mt) &&
+			    !is_migrate_highatomic(mt))
 				set_pageblock_migratetype(page,
 							  MIGRATE_MOVABLE);
 		}
@@ -3791,8 +3793,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 	 */
 	if (can_direct_reclaim &&
 	    (costly_order ||
-	     (order > 0 && ac->migratetype != MIGRATE_MOVABLE))
-	    && !gfp_pfmemalloc_allowed(gfp_mask)) {
+	     (order > 0 && ac->migratetype != MIGRATE_MOVABLE)) &&
+	    !gfp_pfmemalloc_allowed(gfp_mask)) {
 		page = __alloc_pages_direct_compact(gfp_mask, order,
 						    alloc_flags, ac,
 						    INIT_COMPACT_PRIORITY,
-- 
2.10.0.rc2.1.g053435c

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/15] mm: page_alloc: style neatenings Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 03/15] mm: page_alloc: fix brace positions Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 05/15] mm: page_alloc: Move __meminitdata and __initdata uses Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 01/15] mm: page_alloc: whitespace neatening Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 13/15] mm: page_alloc: Remove unnecessary parentheses Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 15/15] mm: page_alloc: Move logical continuations to EOL Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 12/15] mm: page_alloc: Avoid pointer comparisons to NULL Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
  [PATCH 10/15] mm: page_alloc: 80 column neatening Joe Perches <joe@perches.com> - 2017-03-16 03:10 +0100
    Re: [PATCH 10/15] mm: page_alloc: 80 column neatening Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2017-03-16 10:00 +0100
  Re: [PATCH 02/15] mm: page_alloc: align arguments to parenthesis Joe Perches <joe@perches.com> - 2017-03-16 11:30 +0100
    Re: [PATCH 02/15] mm: page_alloc: align arguments to parenthesis Michal Hocko <mhocko@kernel.org> - 2017-03-16 11:40 +0100

csiph-web