summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-03-01 09:35:40 +0100
committerDenys Dmytriyenko <denys@ti.com>2012-03-04 23:35:53 -0500
commit4d6e7c358e61f2053f945423718d0923b6413f99 (patch)
treed2c7ac4906cb51ff7183ab48b497675584c72cfc /recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch
parente31722adc42ef202ae273571ce19a7ac304e5eb6 (diff)
downloadmeta-ti-4d6e7c358e61f2053f945423718d0923b6413f99.tar.gz
linux-ti33x-psp 3.2: update to 3.2.9 and add 2 patches from PSP tree
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch72
1 files changed, 72 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch
new file mode 100644
index 00000000..4c7acabf
--- /dev/null
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.7/0015-writeback-fix-NULL-bdi-dev-in-trace-writeback_single.patch
@@ -0,0 +1,72 @@
1From aec14f459cc9d40f9fd4a7aad2be761de084b320 Mon Sep 17 00:00:00 2001
2From: Wu Fengguang <fengguang.wu@intel.com>
3Date: Tue, 17 Jan 2012 11:18:56 -0600
4Subject: [PATCH 15/30] writeback: fix NULL bdi->dev in trace
5 writeback_single_inode
6
7commit 15eb77a07c714ac80201abd0a9568888bcee6276 upstream.
8
9bdi_prune_sb() resets sb->s_bdi to default_backing_dev_info when the
10tearing down the original bdi. Fix trace_writeback_single_inode to
11use sb->s_bdi=default_backing_dev_info rather than bdi->dev=NULL for a
12teared down bdi.
13
14Reported-by: Rabin Vincent <rabin@rab.in>
15Tested-by: Rabin Vincent <rabin@rab.in>
16Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
17Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
18---
19 fs/fs-writeback.c | 16 ++++++++--------
20 include/trace/events/writeback.h | 2 +-
21 2 files changed, 9 insertions(+), 9 deletions(-)
22
23diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
24index 517f211..54f5786 100644
25--- a/fs/fs-writeback.c
26+++ b/fs/fs-writeback.c
27@@ -48,14 +48,6 @@ struct wb_writeback_work {
28 };
29
30 /*
31- * Include the creation of the trace points after defining the
32- * wb_writeback_work structure so that the definition remains local to this
33- * file.
34- */
35-#define CREATE_TRACE_POINTS
36-#include <trace/events/writeback.h>
37-
38-/*
39 * We don't actually have pdflush, but this one is exported though /proc...
40 */
41 int nr_pdflush_threads;
42@@ -87,6 +79,14 @@ static inline struct inode *wb_inode(struct list_head *head)
43 return list_entry(head, struct inode, i_wb_list);
44 }
45
46+/*
47+ * Include the creation of the trace points after defining the
48+ * wb_writeback_work structure and inline functions so that the definition
49+ * remains local to this file.
50+ */
51+#define CREATE_TRACE_POINTS
52+#include <trace/events/writeback.h>
53+
54 /* Wakeup flusher thread or forker thread to fork it. Requires bdi->wb_lock. */
55 static void bdi_wakeup_flusher(struct backing_dev_info *bdi)
56 {
57diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
58index 99d1d0d..46e389c 100644
59--- a/include/trace/events/writeback.h
60+++ b/include/trace/events/writeback.h
61@@ -418,7 +418,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template,
62
63 TP_fast_assign(
64 strncpy(__entry->name,
65- dev_name(inode->i_mapping->backing_dev_info->dev), 32);
66+ dev_name(inode_to_bdi(inode)->dev), 32);
67 __entry->ino = inode->i_ino;
68 __entry->state = inode->i_state;
69 __entry->dirtied_when = inode->dirtied_when;
70--
711.7.7.4
72