diff options
| -rw-r--r-- | drivers/md/raid1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index f7a8954d665f..a0322db4d355 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -666,7 +666,7 @@ static void raise_barrier(conf_t *conf) | |||
| 666 | /* block any new IO from starting */ | 666 | /* block any new IO from starting */ |
| 667 | conf->barrier++; | 667 | conf->barrier++; |
| 668 | 668 | ||
| 669 | /* No wait for all pending IO to complete */ | 669 | /* Now wait for all pending IO to complete */ |
| 670 | wait_event_lock_irq(conf->wait_barrier, | 670 | wait_event_lock_irq(conf->wait_barrier, |
| 671 | !conf->nr_pending && conf->barrier < RESYNC_DEPTH, | 671 | !conf->nr_pending && conf->barrier < RESYNC_DEPTH, |
| 672 | conf->resync_lock, | 672 | conf->resync_lock, |
| @@ -967,7 +967,7 @@ static int make_request(mddev_t *mddev, struct bio * bio) | |||
| 967 | * we clear any unused pointer in the io_vec, rather | 967 | * we clear any unused pointer in the io_vec, rather |
| 968 | * than leave them unchanged. This is important | 968 | * than leave them unchanged. This is important |
| 969 | * because when we come to free the pages, we won't | 969 | * because when we come to free the pages, we won't |
| 970 | * know the originial bi_idx, so we just free | 970 | * know the original bi_idx, so we just free |
| 971 | * them all | 971 | * them all |
| 972 | */ | 972 | */ |
| 973 | __bio_for_each_segment(bvec, mbio, j, 0) | 973 | __bio_for_each_segment(bvec, mbio, j, 0) |
| @@ -1177,7 +1177,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number) | |||
| 1177 | err = -EBUSY; | 1177 | err = -EBUSY; |
| 1178 | goto abort; | 1178 | goto abort; |
| 1179 | } | 1179 | } |
| 1180 | /* Only remove non-faulty devices is recovery | 1180 | /* Only remove non-faulty devices if recovery |
| 1181 | * is not possible. | 1181 | * is not possible. |
| 1182 | */ | 1182 | */ |
| 1183 | if (!test_bit(Faulty, &rdev->flags) && | 1183 | if (!test_bit(Faulty, &rdev->flags) && |
