Commit 5965b642 authored by NeilBrown's avatar NeilBrown

md/raid1: minor typos and reformatting.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 4b5060dd
...@@ -901,18 +901,18 @@ static sector_t wait_barrier(struct r1conf *conf, struct bio *bio) ...@@ -901,18 +901,18 @@ static sector_t wait_barrier(struct r1conf *conf, struct bio *bio)
* However if there are already pending * However if there are already pending
* requests (preventing the barrier from * requests (preventing the barrier from
* rising completely), and the * rising completely), and the
* pre-process bio queue isn't empty, * per-process bio queue isn't empty,
* then don't wait, as we need to empty * then don't wait, as we need to empty
* that queue to get the nr_pending * that queue to allow conf->start_next_window
* count down. * to increase.
*/ */
wait_event_lock_irq(conf->wait_barrier, wait_event_lock_irq(conf->wait_barrier,
!conf->array_frozen && !conf->array_frozen &&
(!conf->barrier || (!conf->barrier ||
((conf->start_next_window < ((conf->start_next_window <
conf->next_resync + RESYNC_SECTORS) && conf->next_resync + RESYNC_SECTORS) &&
current->bio_list && current->bio_list &&
!bio_list_empty(current->bio_list))), !bio_list_empty(current->bio_list))),
conf->resync_lock); conf->resync_lock);
conf->nr_waiting--; conf->nr_waiting--;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment