mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
ebbeb55561
Also add script used to generate patches and SRC_URI Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From e127104e313afb198838b239fff3289408711db5 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 15/30] writeback: fix NULL bdi->dev in trace
|
|
writeback_single_inode
|
|
|
|
commit 15eb77a07c714ac80201abd0a9568888bcee6276 upstream.
|
|
|
|
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.
|
|
|
|
Reported-by: Rabin Vincent <rabin@rab.in>
|
|
Tested-by: Rabin Vincent <rabin@rab.in>
|
|
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
fs/fs-writeback.c | 16 ++++++++--------
|
|
include/trace/events/writeback.h | 2 +-
|
|
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
|
|
index 517f211..54f5786 100644
|
|
--- a/fs/fs-writeback.c
|
|
+++ b/fs/fs-writeback.c
|
|
@@ -48,14 +48,6 @@ struct wb_writeback_work {
|
|
};
|
|
|
|
/*
|
|
- * 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...
|
|
*/
|
|
int nr_pdflush_threads;
|
|
@@ -87,6 +79,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/include/trace/events/writeback.h b/include/trace/events/writeback.h
|
|
index 99d1d0d..46e389c 100644
|
|
--- a/include/trace/events/writeback.h
|
|
+++ b/include/trace/events/writeback.h
|
|
@@ -418,7 +418,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;
|
|
--
|
|
1.7.9.4
|
|
|