diff options
author | NeilBrown <neilb@suse.com> | 2016-01-04 00:16:58 -0500 |
---|---|---|
committer | NeilBrown <neilb@suse.com> | 2016-01-06 19:01:14 -0500 |
commit | 274d8cbde1bc3bdfb31c5d6a58113dff5cee4f87 (patch) | |
tree | fb09fc10d836a79132e401ebc1b8029a25934a3c /drivers/md/md.c | |
parent | bb9ef71646606e51adfebdc94231fbbc862dbe28 (diff) |
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>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 43a140457e0c..0d1d822eeda5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -250,8 +250,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) | |||
250 | 250 | ||
251 | blk_queue_split(q, &bio, q->bio_split); | 251 | blk_queue_split(q, &bio, q->bio_split); |
252 | 252 | ||
253 | if (mddev == NULL || mddev->pers == NULL | 253 | if (mddev == NULL || mddev->pers == NULL) { |
254 | || !mddev->ready) { | ||
255 | bio_io_error(bio); | 254 | bio_io_error(bio); |
256 | return BLK_QC_T_NONE; | 255 | return BLK_QC_T_NONE; |
257 | } | 256 | } |
@@ -5298,7 +5297,6 @@ int md_run(struct mddev *mddev) | |||
5298 | smp_wmb(); | 5297 | smp_wmb(); |
5299 | spin_lock(&mddev->lock); | 5298 | spin_lock(&mddev->lock); |
5300 | mddev->pers = pers; | 5299 | mddev->pers = pers; |
5301 | mddev->ready = 1; | ||
5302 | spin_unlock(&mddev->lock); | 5300 | spin_unlock(&mddev->lock); |
5303 | rdev_for_each(rdev, mddev) | 5301 | rdev_for_each(rdev, mddev) |
5304 | if (rdev->raid_disk >= 0) | 5302 | if (rdev->raid_disk >= 0) |
@@ -5498,7 +5496,6 @@ static void __md_stop(struct mddev *mddev) | |||
5498 | /* Ensure ->event_work is done */ | 5496 | /* Ensure ->event_work is done */ |
5499 | flush_workqueue(md_misc_wq); | 5497 | flush_workqueue(md_misc_wq); |
5500 | spin_lock(&mddev->lock); | 5498 | spin_lock(&mddev->lock); |
5501 | mddev->ready = 0; | ||
5502 | mddev->pers = NULL; | 5499 | mddev->pers = NULL; |
5503 | spin_unlock(&mddev->lock); | 5500 | spin_unlock(&mddev->lock); |
5504 | pers->free(mddev, mddev->private); | 5501 | pers->free(mddev, mddev->private); |