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

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 <yalin.wang2010@gmail.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index f66476b96264cec3cc11f7797bd8fb3acac64de7..dae7836e1f51c98b27fc8ef7c90daeeb5fcea0d4 100644 (file)
--- 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
index 2aec4241b42a9f0b02c8f4124698d6b595c96390..fd7823ccf301f81cd1127f473c088c6af31835af 100644 (file)
--- 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;
        }