diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 16:44:35 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 16:44:35 (GMT) |
| commit | 36a1987cd891fa82d9981886c3abbbe82c428c0d (patch) | |
| tree | 26f2c1ebc2d0485de222f13ebf812456ee8a7cb8 /drivers/md/md.c | |
| parent | 31ae98359d26ff89b745c4f8094093cbf6ccbdc6 (diff) | |
| parent | 0d9f4f135eb6dea06bdcb7065b1e4ff78274a5e9 (diff) | |
| download | linux-fsl-qoriq-36a1987cd891fa82d9981886c3abbbe82c428c0d.tar.xz | |
Merge tag 'md-3.4-fixes' of git://neil.brown.name/md
Pull two md fixes from NeilBrown:
"One fixes a bug in the new raid10 resize code so is relevant to 3.4
only.
The other fixes a bug in the use of md by dm-raid, so is relevant to
any kernel with dm-raid support"
* tag 'md-3.4-fixes' of git://neil.brown.name/md:
MD: Add del_timer_sync to mddev_suspend (fix nasty panic)
md/raid10: set dev_sectors properly when resizing devices in array.
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 477eb2e..01233d8 100644 --- a/drivers/md/md.c +++ b/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); |