From e20cdd85b7ba69bac09d65173b6bf7d28fd822f1 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Sat, 4 Feb 2012 20:54:03 -0600 Subject: [PATCH] --- yaml --- r: 287461 b: refs/heads/master c: 977b7e3a52a7421ad33a393a38ece59f3d41c2fa h: refs/heads/master i: 287459: b39e6be4addf8f5eda561a205fa7444facef0dce v: v3 --- [refs] | 2 +- trunk/include/trace/events/writeback.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e0406fe4870..c2147dd422a3 100644 --- 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 index 06d302ebcb72..5973410e8f8c 100644 --- 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;