---

yaml --- r: 275563 b: refs/heads/master c: 7a401a9 h: refs/heads/master i: 275561: 45cfc6b 275559: 552f81a v: v3
git-mirror · Nov 11, 2011 · bb3fd4a · bb3fd4a
1 parent 747ddfb
commit bb3fd4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0985394e7fee6b25a7cc8335d45bc1c1a8ab2d3
+refs/heads/master: 7a401a972df8e184b3d1a3fc958c0a4ddee8d312
diff --git a/trunk/mm/backing-dev.c b/trunk/mm/backing-dev.c
@@ -724,6 +724,14 @@ void bdi_destroy(struct backing_dev_info *bdi)
 
 	bdi_unregister(bdi);
 
+	/*
+	 * If bdi_unregister() had already been called earlier, the
+	 * wakeup_timer could still be armed because bdi_prune_sb()
+	 * can race with the bdi_wakeup_thread_delayed() calls from
+	 * __mark_inode_dirty().
+	 */
+	del_timer_sync(&bdi->wb.wakeup_timer);
+
 	for (i = 0; i < NR_BDI_STAT_ITEMS; i++)
 		percpu_counter_destroy(&bdi->bdi_stat[i]);