diff options
| author | NeilBrown <neilb@suse.com> | 2017-03-15 14:05:12 +1100 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2017-03-22 19:15:57 -0700 |
| commit | 16d997b78b157315f5c90fcbc2f9ce575cb3879f (patch) | |
| tree | ae10253861afd7ce27aae967a4cf075f4b2621af /drivers/md/raid5.h | |
| parent | 497280509f32340d90feac030bce18006a3e3605 (diff) | |
| download | linux-16d997b78b157315f5c90fcbc2f9ce575cb3879f.tar.gz linux-16d997b78b157315f5c90fcbc2f9ce575cb3879f.tar.bz2 linux-16d997b78b157315f5c90fcbc2f9ce575cb3879f.zip | |
md/raid5: simplfy delaying of writes while metadata is updated.
If a device fails during a write, we must ensure the failure is
recorded in the metadata before the completion of the write is
acknowleged.
Commit c3cce6cda162 ("md/raid5: ensure device failure recorded before
write request returns.") added code for this, but it was
unnecessarily complicated. We already had similar functionality for
handling updates to the bad-block-list, thanks to Commit de393cdea66c
("md: make it easier to wait for bad blocks to be acknowledged.")
So revert most of the former commit, and instead avoid collecting
completed writes if MD_CHANGE_PENDING is set. raid5d() will then flush
the metadata and retry the stripe_head.
As this change can leave a stripe_head ready for handling immediately
after handle_active_stripes() returns, we change raid5_do_work() to
pause when MD_CHANGE_PENDING is set, so that it doesn't spin.
We check MD_CHANGE_PENDING *after* analyse_stripe() as it could be set
asynchronously. After analyse_stripe(), we have collected stable data
about the state of devices, which will be used to make decisions.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index ba5b7a3790af..13800dc9dd88 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -638,9 +638,6 @@ struct r5conf { int skip_copy; /* Don't copy data from bio to stripe cache */ struct list_head *last_hold; /* detect hold_list promotions */ - /* bios to have bi_end_io called after metadata is synced */ - struct bio_list return_bi; - atomic_t reshape_stripes; /* stripes with pending writes for reshape */ /* unfortunately we need two cache names as we temporarily have * two caches. |