From 1d5cfbb143621cf59399f1642a5b5f9e3c4a783c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 28 Sep 2011 08:03:00 -0700 Subject: [PATCH] --- yaml --- r: 264151 b: refs/heads/master c: c54a06d45a937750e76df2f91e940f82c07c5bf7 h: refs/heads/master i: 264149: dad456fd261c087a2cd46aeaf944c0f2ec96bb91 264147: 7cd2092525f25e4fae3279623dee179cdec5649a 264143: 5a6048e1fa8443341b981227f4bcaeae2250fdbb v: v3 --- [refs] | 2 +- trunk/include/trace/events/writeback.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 21f91284c7bb..fefd1e303f40 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 777eb1bf15b8532c396821774bf6451e563438f5 +refs/heads/master: c54a06d45a937750e76df2f91e940f82c07c5bf7 diff --git a/trunk/include/trace/events/writeback.h b/trunk/include/trace/events/writeback.h index 6bca4cc0063c..5f172703eb4f 100644 --- a/trunk/include/trace/events/writeback.h +++ b/trunk/include/trace/events/writeback.h @@ -298,7 +298,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, __array(char, name, 32) __field(unsigned long, ino) __field(unsigned long, state) - __field(unsigned long, age) + __field(unsigned long, dirtied_when) __field(unsigned long, writeback_index) __field(long, nr_to_write) __field(unsigned long, wrote) @@ -309,19 +309,19 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, dev_name(inode->i_mapping->backing_dev_info->dev), 32); __entry->ino = inode->i_ino; __entry->state = inode->i_state; - __entry->age = (jiffies - inode->dirtied_when) * - 1000 / HZ; + __entry->dirtied_when = inode->dirtied_when; __entry->writeback_index = inode->i_mapping->writeback_index; __entry->nr_to_write = nr_to_write; __entry->wrote = nr_to_write - wbc->nr_to_write; ), - TP_printk("bdi %s: ino=%lu state=%s age=%lu " + TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu " "index=%lu to_write=%ld wrote=%lu", __entry->name, __entry->ino, show_inode_state(__entry->state), - __entry->age, + __entry->dirtied_when, + (jiffies - __entry->dirtied_when) / HZ, __entry->writeback_index, __entry->nr_to_write, __entry->wrote