|
@@ -94,6 +94,8 @@
|
|
#define __inline__
|
|
#define __inline__
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+#define printk_rl(args...) ((void) (printk_ratelimit() && printk(args)))
|
|
|
|
+
|
|
#if !RAID6_USE_EMPTY_ZERO_PAGE
|
|
#if !RAID6_USE_EMPTY_ZERO_PAGE
|
|
/* In .bss so it's zeroed */
|
|
/* In .bss so it's zeroed */
|
|
const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
|
|
const char raid6_empty_zero_page[PAGE_SIZE] __attribute__((aligned(256)));
|
|
@@ -1143,10 +1145,12 @@ static void raid5_end_read_request(struct bio * bi, int error)
|
|
set_bit(R5_UPTODATE, &sh->dev[i].flags);
|
|
set_bit(R5_UPTODATE, &sh->dev[i].flags);
|
|
if (test_bit(R5_ReadError, &sh->dev[i].flags)) {
|
|
if (test_bit(R5_ReadError, &sh->dev[i].flags)) {
|
|
rdev = conf->disks[i].rdev;
|
|
rdev = conf->disks[i].rdev;
|
|
- printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",
|
|
|
|
- mdname(conf->mddev), STRIPE_SECTORS,
|
|
|
|
- (unsigned long long)(sh->sector + rdev->data_offset),
|
|
|
|
- bdevname(rdev->bdev, b));
|
|
|
|
|
|
+ printk_rl(KERN_INFO "raid5:%s: read error corrected"
|
|
|
|
+ " (%lu sectors at %llu on %s)\n",
|
|
|
|
+ mdname(conf->mddev), STRIPE_SECTORS,
|
|
|
|
+ (unsigned long long)(sh->sector
|
|
|
|
+ + rdev->data_offset),
|
|
|
|
+ bdevname(rdev->bdev, b));
|
|
clear_bit(R5_ReadError, &sh->dev[i].flags);
|
|
clear_bit(R5_ReadError, &sh->dev[i].flags);
|
|
clear_bit(R5_ReWrite, &sh->dev[i].flags);
|
|
clear_bit(R5_ReWrite, &sh->dev[i].flags);
|
|
}
|
|
}
|
|
@@ -1160,16 +1164,22 @@ static void raid5_end_read_request(struct bio * bi, int error)
|
|
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
|
|
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
|
|
atomic_inc(&rdev->read_errors);
|
|
atomic_inc(&rdev->read_errors);
|
|
if (conf->mddev->degraded)
|
|
if (conf->mddev->degraded)
|
|
- printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",
|
|
|
|
- mdname(conf->mddev),
|
|
|
|
- (unsigned long long)(sh->sector + rdev->data_offset),
|
|
|
|
- bdn);
|
|
|
|
|
|
+ printk_rl(KERN_WARNING
|
|
|
|
+ "raid5:%s: read error not correctable "
|
|
|
|
+ "(sector %llu on %s).\n",
|
|
|
|
+ mdname(conf->mddev),
|
|
|
|
+ (unsigned long long)(sh->sector
|
|
|
|
+ + rdev->data_offset),
|
|
|
|
+ bdn);
|
|
else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
|
|
else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
|
|
/* Oh, no!!! */
|
|
/* Oh, no!!! */
|
|
- printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",
|
|
|
|
- mdname(conf->mddev),
|
|
|
|
- (unsigned long long)(sh->sector + rdev->data_offset),
|
|
|
|
- bdn);
|
|
|
|
|
|
+ printk_rl(KERN_WARNING
|
|
|
|
+ "raid5:%s: read error NOT corrected!! "
|
|
|
|
+ "(sector %llu on %s).\n",
|
|
|
|
+ mdname(conf->mddev),
|
|
|
|
+ (unsigned long long)(sh->sector
|
|
|
|
+ + rdev->data_offset),
|
|
|
|
+ bdn);
|
|
else if (atomic_read(&rdev->read_errors)
|
|
else if (atomic_read(&rdev->read_errors)
|
|
> conf->max_nr_stripes)
|
|
> conf->max_nr_stripes)
|
|
printk(KERN_WARNING
|
|
printk(KERN_WARNING
|