diff options
| author | NeilBrown <neilb@suse.de> | 2014-09-04 07:51:44 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-10-09 01:07:04 +0200 |
| commit | 5965b642ff1ba36d7a1a22df2b3c5e2cb0445e3a (patch) | |
| tree | fe7566fe1097e8f1963d91fe7eb08c6999b8da08 /drivers/md | |
| parent | md/bitmap: always wait for writes on unplug. (diff) | |
| download | linux-5965b642ff1ba36d7a1a22df2b3c5e2cb0445e3a.tar.xz linux-5965b642ff1ba36d7a1a22df2b3c5e2cb0445e3a.zip | |
md/raid1: minor typos and reformatting.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 55de4f6f7eaf..0111ff3a81ad 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -901,18 +901,18 @@ static sector_t wait_barrier(struct r1conf *conf, struct bio *bio) * However if there are already pending * requests (preventing the barrier from * 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 - * that queue to get the nr_pending - * count down. + * that queue to allow conf->start_next_window + * to increase. */ wait_event_lock_irq(conf->wait_barrier, !conf->array_frozen && (!conf->barrier || - ((conf->start_next_window < - conf->next_resync + RESYNC_SECTORS) && - current->bio_list && - !bio_list_empty(current->bio_list))), + ((conf->start_next_window < + conf->next_resync + RESYNC_SECTORS) && + current->bio_list && + !bio_list_empty(current->bio_list))), conf->resync_lock); conf->nr_waiting--; } |