md/raid1: minor typos and reformatting.
authorNeilBrown <neilb@suse.de>
Thu, 4 Sep 2014 05:51:44 +0000 (15:51 +1000)
committerNeilBrown <neilb@suse.de>
Wed, 8 Oct 2014 23:07:04 +0000 (10:07 +1100)
Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/raid1.c

index 55de4f6f7eaf47a4633e231d0943f3766f66aee5..0111ff3a81ad94cfd6ca32499fef9a55ceb92522 100644 (file)
@@ -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--;
        }