From b39e6be4addf8f5eda561a205fa7444facef0dce Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Tue, 17 Jan 2012 11:18:56 -0600
Subject: [PATCH] --- yaml --- r: 287459 b: refs/heads/master c:
 15eb77a07c714ac80201abd0a9568888bcee6276 h: refs/heads/master i:   287457:
 53ba550ba19e69c6d2a8be1b1d816aa980266905   287455:
 ba7811cd2f386b72b49ee497027193f1e115eb61 v: v3

---
 [refs]                                 |  2 +-
 trunk/fs/fs-writeback.c                | 16 ++++++++--------
 trunk/include/trace/events/writeback.h |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 422eaad396af..435fbd2601e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2673b4cf5d59c3ee5e0c12f6d734d38770324dc4
+refs/heads/master: 15eb77a07c714ac80201abd0a9568888bcee6276
diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c
index f855916657ba..5b4a9362d5aa 100644
--- a/trunk/fs/fs-writeback.c
+++ b/trunk/fs/fs-writeback.c
@@ -52,14 +52,6 @@ struct wb_writeback_work {
 	struct completion *done;	/* set if the caller waits */
 };
 
-/*
- * Include the creation of the trace points after defining the
- * wb_writeback_work structure so that the definition remains local to this
- * file.
- */
-#define CREATE_TRACE_POINTS
-#include <trace/events/writeback.h>
-
 /*
  * We don't actually have pdflush, but this one is exported though /proc...
  */
@@ -92,6 +84,14 @@ static inline struct inode *wb_inode(struct list_head *head)
 	return list_entry(head, struct inode, i_wb_list);
 }
 
+/*
+ * Include the creation of the trace points after defining the
+ * wb_writeback_work structure and inline functions so that the definition
+ * remains local to this file.
+ */
+#define CREATE_TRACE_POINTS
+#include <trace/events/writeback.h>
+
 /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */
 static void bdi_wakeup_flusher(struct backing_dev_info *bdi)
 {
diff --git a/trunk/include/trace/events/writeback.h b/trunk/include/trace/events/writeback.h
index 8588a8918023..06d302ebcb72 100644
--- a/trunk/include/trace/events/writeback.h
+++ b/trunk/include/trace/events/writeback.h
@@ -426,7 +426,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
 
 	TP_fast_assign(
 		strncpy(__entry->name,
-			dev_name(inode->i_mapping->backing_dev_info->dev), 32);
+			dev_name(inode_to_bdi(inode)->dev), 32);
 		__entry->ino		= inode->i_ino;
 		__entry->state		= inode->i_state;
 		__entry->dirtied_when	= inode->dirtied_when;