From: Ingo Molnar <[EMAIL PROTECTED]>
filevec_add_drain_all() is called under locks and schedule_on_each_cpu() can
schedule. Solve this by using the new schedule_on_each_cpu_wq().
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
---
fs/file_table.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
Index: linux-2.6/fs/file_table.c
===================================================================
--- linux-2.6.orig/fs/file_table.c 2007-01-27 23:09:23.000000000 +0100
+++ linux-2.6/fs/file_table.c 2007-01-27 23:10:02.000000000 +0100
@@ -333,6 +333,22 @@ static void __filevec_add(struct filevec
filevec_reinit(fvec);
}
+/*
+ * Flush files per-CPU workqueue:
+ */
+static struct workqueue_struct *flush_files_workqueue;
+
+int __init flush_files_init(void)
+{
+ flush_files_workqueue = create_workqueue("flush_filesd");
+ if (!flush_files_workqueue)
+ panic("Failed to create flush_filesd\n");
+
+ return 0;
+}
+
+__initcall(flush_files_init);
+
static void filevec_add_drain(void)
{
struct filevec *fvec = &get_cpu_var(sb_fvec);
@@ -341,14 +357,15 @@ static void filevec_add_drain(void)
put_cpu_var(sb_fvec);
}
-static void filevec_add_drain_per_cpu(struct work_struct *dummy)
+static void filevec_add_drain_per_cpu(struct work_struct *none)
{
filevec_add_drain();
}
int filevec_add_drain_all(void)
{
- return schedule_on_each_cpu(filevec_add_drain_per_cpu);
+ return schedule_on_each_cpu_wq(flush_files_workqueue,
+ filevec_add_drain_per_cpu);
}
EXPORT_SYMBOL_GPL(filevec_add_drain_all);
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
