diff options
| author | Jonathan Brassow <jbrassow@redhat.com> | 2012-05-16 04:06:14 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-20 22:56:50 +0100 |
| commit | ad87af4331c0b242788fbf668eefe2e311f2cd7f (patch) | |
| tree | 00280253e556509386c1797135f3b815296c8814 /drivers/md/md.c | |
| parent | e3b9dca169250b65f4dbe2460bcf7efe7098f1b7 (diff) | |
| download | kernel_samsung_smdk4412-ad87af4331c0b242788fbf668eefe2e311f2cd7f.zip kernel_samsung_smdk4412-ad87af4331c0b242788fbf668eefe2e311f2cd7f.tar.gz kernel_samsung_smdk4412-ad87af4331c0b242788fbf668eefe2e311f2cd7f.tar.bz2 | |
MD: Add del_timer_sync to mddev_suspend (fix nasty panic)
commit 0d9f4f135eb6dea06bdcb7065b1e4ff78274a5e9 upstream.
Use del_timer_sync to remove timer before mddev_suspend finishes.
We don't want a timer going off after an mddev_suspend is called. This is
especially true with device-mapper, since it can call the destructor function
immediately following a suspend. This results in the removal (kfree) of the
structures upon which the timer depends - resulting in a very ugly panic.
Therefore, we add a del_timer_sync to mddev_suspend to prevent this.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 065ab4f..adcd850 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -392,6 +392,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); |