summary refs log tree commit diff
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2014-09-04 15:51:44 +1000
committerNeilBrown <neilb@suse.de>2014-10-09 10:07:04 +1100
commit5965b642ff1ba36d7a1a22df2b3c5e2cb0445e3a (patch)
treefe7566fe1097e8f1963d91fe7eb08c6999b8da08 /drivers/md
parent4b5060ddae2b03c5387321fafc089d242225697a (diff)
downloadlinux-5965b642ff1ba36d7a1a22df2b3c5e2cb0445e3a.tar.gz
md/raid1: minor typos and reformatting.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid1.c14
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--;
 	}