md: Remove 'ready' field from mddev.
This field is always set in tandem with ->pers, and when it is tested ->pers is also tested. So ->ready is not needed. It was needed once, but code rearrangement and locking changes have removed that needed. Signed-off-by: NeilBrown <neilb@suse.com>hifive-unleashed-5.1
parent
bb9ef71646
commit
274d8cbde1
|
@ -250,8 +250,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
|
||||||
|
|
||||||
blk_queue_split(q, &bio, q->bio_split);
|
blk_queue_split(q, &bio, q->bio_split);
|
||||||
|
|
||||||
if (mddev == NULL || mddev->pers == NULL
|
if (mddev == NULL || mddev->pers == NULL) {
|
||||||
|| !mddev->ready) {
|
|
||||||
bio_io_error(bio);
|
bio_io_error(bio);
|
||||||
return BLK_QC_T_NONE;
|
return BLK_QC_T_NONE;
|
||||||
}
|
}
|
||||||
|
@ -5298,7 +5297,6 @@ int md_run(struct mddev *mddev)
|
||||||
smp_wmb();
|
smp_wmb();
|
||||||
spin_lock(&mddev->lock);
|
spin_lock(&mddev->lock);
|
||||||
mddev->pers = pers;
|
mddev->pers = pers;
|
||||||
mddev->ready = 1;
|
|
||||||
spin_unlock(&mddev->lock);
|
spin_unlock(&mddev->lock);
|
||||||
rdev_for_each(rdev, mddev)
|
rdev_for_each(rdev, mddev)
|
||||||
if (rdev->raid_disk >= 0)
|
if (rdev->raid_disk >= 0)
|
||||||
|
@ -5498,7 +5496,6 @@ static void __md_stop(struct mddev *mddev)
|
||||||
/* Ensure ->event_work is done */
|
/* Ensure ->event_work is done */
|
||||||
flush_workqueue(md_misc_wq);
|
flush_workqueue(md_misc_wq);
|
||||||
spin_lock(&mddev->lock);
|
spin_lock(&mddev->lock);
|
||||||
mddev->ready = 0;
|
|
||||||
mddev->pers = NULL;
|
mddev->pers = NULL;
|
||||||
spin_unlock(&mddev->lock);
|
spin_unlock(&mddev->lock);
|
||||||
pers->free(mddev, mddev->private);
|
pers->free(mddev, mddev->private);
|
||||||
|
|
|
@ -246,8 +246,6 @@ struct mddev {
|
||||||
* are happening, so run/
|
* are happening, so run/
|
||||||
* takeover/stop are not safe
|
* takeover/stop are not safe
|
||||||
*/
|
*/
|
||||||
int ready; /* See when safe to pass
|
|
||||||
* IO requests down */
|
|
||||||
struct gendisk *gendisk;
|
struct gendisk *gendisk;
|
||||||
|
|
||||||
struct kobject kobj;
|
struct kobject kobj;
|
||||||
|
|
Loading…
Reference in New Issue