Commit f5efd45a authored by Dan Williams's avatar Dan Williams Committed by NeilBrown
Browse files

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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 1d9d5241

drivers/md/raid5.c

+12 −13
Original line number Diff line number Diff line
@@ -4715,6 +4715,18 @@ static raid5_conf_t *setup_conf(mddev_t *mddev) 
	conf = kzalloc(sizeof(raid5_conf_t), GFP_KERNEL);

	if (conf == NULL)

		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->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)

		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));



	list_for_each_entry(rdev, &mddev->disks, same_set) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE