aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index cac97080b278..c4ef3071c290 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -390,7 +390,7 @@ raid5_end_read_request(struct bio *bi, int error);
390static void 390static void
391raid5_end_write_request(struct bio *bi, int error); 391raid5_end_write_request(struct bio *bi, int error);
392 392
393static void ops_run_io(struct stripe_head *sh) 393static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
394{ 394{
395 raid5_conf_t *conf = sh->raid_conf; 395 raid5_conf_t *conf = sh->raid_conf;
396 int i, disks = sh->disks; 396 int i, disks = sh->disks;
@@ -425,9 +425,7 @@ static void ops_run_io(struct stripe_head *sh)
425 rcu_read_unlock(); 425 rcu_read_unlock();
426 426
427 if (rdev) { 427 if (rdev) {
428 if (test_bit(STRIPE_SYNCING, &sh->state) || 428 if (s->syncing || s->expanding || s->expanded)
429 test_bit(STRIPE_EXPAND_SOURCE, &sh->state) ||
430 test_bit(STRIPE_EXPAND_READY, &sh->state))
431 md_sync_acct(rdev->bdev, STRIPE_SECTORS); 429 md_sync_acct(rdev->bdev, STRIPE_SECTORS);
432 430
433 set_bit(STRIPE_IO_STARTED, &sh->state); 431 set_bit(STRIPE_IO_STARTED, &sh->state);
@@ -2902,10 +2900,9 @@ static void handle_stripe5(struct stripe_head *sh)
2902 if (pending) 2900 if (pending)
2903 raid5_run_ops(sh, pending); 2901 raid5_run_ops(sh, pending);
2904 2902
2905 ops_run_io(sh); 2903 ops_run_io(sh, &s);
2906 2904
2907 return_io(return_bi); 2905 return_io(return_bi);
2908
2909} 2906}
2910 2907
2911static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page) 2908static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)