---

yaml --- r: 287461 b: refs/heads/master c: 977b7e3 h: refs/heads/master i: 287459: b39e6be v: v3
git-mirror · Feb 6, 2012 · e20cdd8 · e20cdd8
1 parent 144f170
commit e20cdd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3310225dfc71a35a2cc9340c15c0e08b14b3c754
+refs/heads/master: 977b7e3a52a7421ad33a393a38ece59f3d41c2fa
diff --git a/trunk/include/trace/events/writeback.h b/trunk/include/trace/events/writeback.h
@@ -47,7 +47,10 @@ DECLARE_EVENT_CLASS(writeback_work_class,
 		__field(int, reason)
 	),
 	TP_fast_assign(
-		strncpy(__entry->name, dev_name(bdi->dev), 32);
+		struct device *dev = bdi->dev;
+		if (!dev)
+			dev = default_backing_dev_info.dev;
+		strncpy(__entry->name, dev_name(dev), 32);
 		__entry->nr_pages = work->nr_pages;
 		__entry->sb_dev = work->sb ? work->sb->s_dev : 0;
 		__entry->sync_mode = work->sync_mode;