md/raid5: initialize conf->device_lock earlier
Deallocating a raid5_conf_t structure requires taking 'device_lock'. Ensure it is initialized before it is used, i.e. initialize the lock before attempting any further initializations that might fail. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
1d9d52416c
commit
f5efd45ae5
|
@ -4715,6 +4715,18 @@ static raid5_conf_t *setup_conf(mddev_t *mddev)
|
||||||
conf = kzalloc(sizeof(raid5_conf_t), GFP_KERNEL);
|
conf = kzalloc(sizeof(raid5_conf_t), GFP_KERNEL);
|
||||||
if (conf == NULL)
|
if (conf == NULL)
|
||||||
goto abort;
|
goto abort;
|
||||||
|
spin_lock_init(&conf->device_lock);
|
||||||
|
init_waitqueue_head(&conf->wait_for_stripe);
|
||||||
|
init_waitqueue_head(&conf->wait_for_overlap);
|
||||||
|
INIT_LIST_HEAD(&conf->handle_list);
|
||||||
|
INIT_LIST_HEAD(&conf->hold_list);
|
||||||
|
INIT_LIST_HEAD(&conf->delayed_list);
|
||||||
|
INIT_LIST_HEAD(&conf->bitmap_list);
|
||||||
|
INIT_LIST_HEAD(&conf->inactive_list);
|
||||||
|
atomic_set(&conf->active_stripes, 0);
|
||||||
|
atomic_set(&conf->preread_active_stripes, 0);
|
||||||
|
atomic_set(&conf->active_aligned_reads, 0);
|
||||||
|
conf->bypass_threshold = BYPASS_THRESHOLD;
|
||||||
|
|
||||||
conf->raid_disks = mddev->raid_disks;
|
conf->raid_disks = mddev->raid_disks;
|
||||||
conf->scribble_len = scribble_len(conf->raid_disks);
|
conf->scribble_len = scribble_len(conf->raid_disks);
|
||||||
|
@ -4737,19 +4749,6 @@ static raid5_conf_t *setup_conf(mddev_t *mddev)
|
||||||
if (raid5_alloc_percpu(conf) != 0)
|
if (raid5_alloc_percpu(conf) != 0)
|
||||||
goto abort;
|
goto abort;
|
||||||
|
|
||||||
spin_lock_init(&conf->device_lock);
|
|
||||||
init_waitqueue_head(&conf->wait_for_stripe);
|
|
||||||
init_waitqueue_head(&conf->wait_for_overlap);
|
|
||||||
INIT_LIST_HEAD(&conf->handle_list);
|
|
||||||
INIT_LIST_HEAD(&conf->hold_list);
|
|
||||||
INIT_LIST_HEAD(&conf->delayed_list);
|
|
||||||
INIT_LIST_HEAD(&conf->bitmap_list);
|
|
||||||
INIT_LIST_HEAD(&conf->inactive_list);
|
|
||||||
atomic_set(&conf->active_stripes, 0);
|
|
||||||
atomic_set(&conf->preread_active_stripes, 0);
|
|
||||||
atomic_set(&conf->active_aligned_reads, 0);
|
|
||||||
conf->bypass_threshold = BYPASS_THRESHOLD;
|
|
||||||
|
|
||||||
pr_debug("raid5: run(%s) called.\n", mdname(mddev));
|
pr_debug("raid5: run(%s) called.\n", mdname(mddev));
|
||||||
|
|
||||||
list_for_each_entry(rdev, &mddev->disks, same_set) {
|
list_for_each_entry(rdev, &mddev->disks, same_set) {
|
||||||
|
|
Loading…
Reference in New Issue