1 files changed, 5 insertions, 7 deletions

diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index cee02d65ab3f..0e9310905413 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -47,7 +47,7 @@ TRACE_EVENT(writeback_dirty_page,
 
         TP_fast_assign(
                 strncpy(__entry->name,
-                        mapping ? dev_name(mapping->backing_dev_info->dev) : "(unknown)", 32);
+                        mapping ? dev_name(inode_to_bdi(mapping->host)->dev) : "(unknown)", 32);
                 __entry->ino = mapping ? mapping->host->i_ino : 0;
                 __entry->index = page->index;
         ),
@@ -72,7 +72,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template,
         ),
 
         TP_fast_assign(
-                struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
+                struct backing_dev_info *bdi = inode_to_bdi(inode);
 
                 /* may be called for files on pseudo FSes w/ unregistered bdi */
                 strncpy(__entry->name,
@@ -116,7 +116,7 @@ DECLARE_EVENT_CLASS(writeback_write_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->sync_mode      = wbc->sync_mode;
         ),
@@ -156,10 +156,8 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                 __field(int, reason)
         ),
         TP_fast_assign(
-                struct device *dev = bdi->dev;
-                if (!dev)
-                        dev = default_backing_dev_info.dev;
-                strncpy(__entry->name, dev_name(dev), 32);
+                strncpy(__entry->name,
+                        bdi->dev ? dev_name(bdi->dev) : "(unknown)", 32);
                 __entry->nr_pages = work->nr_pages;
                 __entry->sb_dev = work->sb ? work->sb->s_dev : 0;
                 __entry->sync_mode = work->sync_mode;