---

yaml --- r: 300300 b: refs/heads/master c: 0d9f4f1 h: refs/heads/master v: v3
git-mirror · May 17, 2012 · 5bdfceb · 5bdfceb
1 parent 60d1e0b
commit 5bdfceb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6508fdbf40a92fd7c19d32780ea33ce8e8362b93
+refs/heads/master: 0d9f4f135eb6dea06bdcb7065b1e4ff78274a5e9
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -391,6 +391,8 @@ void mddev_suspend(struct mddev *mddev)
 	synchronize_rcu();
 	wait_event(mddev->sb_wait, atomic_read(&mddev->active_io) == 0);
 	mddev->pers->quiesce(mddev, 1);
+
+	del_timer_sync(&mddev->safemode_timer);
 }
 EXPORT_SYMBOL_GPL(mddev_suspend);