From 5bdfcebc1b1cdcf98a17c93ce1fadcd649dc97e6 Mon Sep 17 00:00:00 2001
From: Jonathan Brassow <jbrassow@redhat.com>
Date: Wed, 16 May 2012 04:06:14 -0500
Subject: [PATCH] --- yaml --- r: 300300 b: refs/heads/master c:
 0d9f4f135eb6dea06bdcb7065b1e4ff78274a5e9 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 42d3f0a3d93f..cade60827786 100644
--- 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
index 477eb2e180c0..01233d855eb2 100644
--- 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);