Commit 15eb77a0 authored by Wu Fengguang's avatar Wu Fengguang

writeback: fix NULL bdi->dev in trace writeback_single_inode

bdi_prune_sb() resets sb->s_bdi to default_backing_dev_info when the
tearing down the original bdi. Fix trace_writeback_single_inode to
use sb->s_bdi=default_backing_dev_info rather than bdi->dev=NULL for a
teared down bdi.

Cc: <stable@kernel.org>
Reported-by: default avatarRabin Vincent <rabin@rab.in>
Tested-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
parent 2673b4cf
...@@ -52,14 +52,6 @@ struct wb_writeback_work { ...@@ -52,14 +52,6 @@ struct wb_writeback_work {
struct completion *done; /* set if the caller waits */ 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... * 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) ...@@ -92,6 +84,14 @@ static inline struct inode *wb_inode(struct list_head *head)
return list_entry(head, struct inode, i_wb_list); 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. */ /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */
static void bdi_wakeup_flusher(struct backing_dev_info *bdi) static void bdi_wakeup_flusher(struct backing_dev_info *bdi)
{ {
......
...@@ -426,7 +426,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, ...@@ -426,7 +426,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
TP_fast_assign( TP_fast_assign(
strncpy(__entry->name, 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->ino = inode->i_ino;
__entry->state = inode->i_state; __entry->state = inode->i_state;
__entry->dirtied_when = inode->dirtied_when; __entry->dirtied_when = inode->dirtied_when;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment