mm/vmscan.c: change trace_mm_vmscan_writepage() proto type

yalin wang · torvalds · commit 3aa238511116 · 2016-01-14T16:00:49.000-08:00
Move trace_reclaim_flags() into trace function, so that we don't need
caculate these flags if the trace is disabled.

Signed-off-by: yalin wang &lt;yalin.wang2010@gmail.com&gt;
Reviewed-by: Steven Rostedt &lt;rostedt@goodmis.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
@@ -330,10 +330,9 @@ DEFINE_EVENT(mm_vmscan_lru_isolate_template, mm_vmscan_memcg_isolate,
 
 TRACE_EVENT(mm_vmscan_writepage,
 
-	TP_PROTO(struct page *page,
-		int reclaim_flags),
+	TP_PROTO(struct page *page),
 
-	TP_ARGS(page, reclaim_flags),
+	TP_ARGS(page),
 
 	TP_STRUCT__entry(
 		__field(unsigned long, pfn)
@@ -342,7 +341,7 @@ TRACE_EVENT(mm_vmscan_writepage,
 
 	TP_fast_assign(
 		__entry->pfn = page_to_pfn(page);
-		__entry->reclaim_flags = reclaim_flags;
+		__entry->reclaim_flags = trace_reclaim_flags(page);
 	),
 
 	TP_printk("page=%p pfn=%lu flags=%s",
diff --git a/mm/vmscan.c b/mm/vmscan.c
@@ -594,7 +594,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
 			/* synchronous write or broken a_ops? */
 			ClearPageReclaim(page);
 		}
-		trace_mm_vmscan_writepage(page, trace_reclaim_flags(page));
+		trace_mm_vmscan_writepage(page);
 		inc_zone_page_state(page, NR_VMSCAN_WRITE);
 		return PAGE_SUCCESS;
 	}

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ static pageout_t pageout(struct page page, struct address_space mapping,`
`594`	`594`	`/* synchronous write or broken a_ops? */`
`595`	`595`	`ClearPageReclaim(page);`
`596`	`596`	`}`
`597`		`- trace_mm_vmscan_writepage(page, trace_reclaim_flags(page));`
	`597`	`+ trace_mm_vmscan_writepage(page);`
`598`	`598`	`inc_zone_page_state(page, NR_VMSCAN_WRITE);`
`599`	`599`	`return PAGE_SUCCESS;`
`600`	`600`	`}`