diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-06-06 18:43:53 +0000 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-06-09 11:27:05 -0700 |
| commit | 16936480e23dcb50b7b9d76f61288876fcbd65f1 (patch) | |
| tree | 2afecf9f4e3b309cd87ad9d3687265fa18fe05f4 | |
| parent | 3c327ceee972ed6c39226d92e7855b6544ae974f (diff) | |
md: fix uninitialized use of mddev->recovery_wait
upstream commit: a6d8113a986c66aeb379a26b6e0062488b3e59e1
If an array was created with --assume-clean we will oops when trying to
set ->resync_max.
Fix this by initializing ->recovery_wait in mddev_find.
Cc: <stable@kernel.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 9f6d228b5607..ba34990a6b50 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -274,6 +274,7 @@ static mddev_t * mddev_find(dev_t unit) atomic_set(&new->active, 1); spin_lock_init(&new->write_lock); init_waitqueue_head(&new->sb_wait); + init_waitqueue_head(&new->recovery_wait); new->reshape_position = MaxSector; new->resync_max = MaxSector; @@ -5559,7 +5560,6 @@ void md_do_sync(mddev_t *mddev) window/2,(unsigned long long) max_sectors/2); atomic_set(&mddev->recovery_active, 0); - init_waitqueue_head(&mddev->recovery_wait); last_check = 0; if (j>2) { |