diff --git a/[refs] b/[refs] index 3573371b2bb6..a4dae0a80913 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75a73a29e520a6ce982b0da6dd8b7560ae3faa90 +refs/heads/master: 7b0bb5368a7195606eca475d9f4e291ab7227052 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index cee9f93b35c4..eacf02a6ec5f 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -1527,7 +1527,7 @@ static void raid5_end_read_request(struct bio * bi, int error) clear_bit(R5_UPTODATE, &sh->dev[i].flags); atomic_inc(&rdev->read_errors); - if (conf->mddev->degraded) + if (conf->mddev->degraded >= conf->max_degraded) printk_rl(KERN_WARNING "md/raid:%s: read error not correctable " "(sector %llu on %s).\n",