mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
[PATCH] md: small cleanups for raid5
Resync code: A test that isn't needed, a 'compute_block' that makes more sense elsewhere (And then doesn't need a test), a couple of BUG_ONs to confirm the change makes sense. Printks: A few were missing KERN_* Also fix a typo in a comment.. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0a27ec96b6
commit
14f8d26b8e
@ -417,7 +417,7 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,
|
||||
set_bit(R5_UPTODATE, &sh->dev[i].flags);
|
||||
#endif
|
||||
if (test_bit(R5_ReadError, &sh->dev[i].flags)) {
|
||||
printk("R5: read error corrected!!\n");
|
||||
printk(KERN_INFO "raid5: read error corrected!!\n");
|
||||
clear_bit(R5_ReadError, &sh->dev[i].flags);
|
||||
clear_bit(R5_ReWrite, &sh->dev[i].flags);
|
||||
}
|
||||
@ -428,13 +428,14 @@ static int raid5_end_read_request(struct bio * bi, unsigned int bytes_done,
|
||||
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
|
||||
atomic_inc(&conf->disks[i].rdev->read_errors);
|
||||
if (conf->mddev->degraded)
|
||||
printk("R5: read error not correctable.\n");
|
||||
printk(KERN_WARNING "raid5: read error not correctable.\n");
|
||||
else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
|
||||
/* Oh, no!!! */
|
||||
printk("R5: read error NOT corrected!!\n");
|
||||
printk(KERN_WARNING "raid5: read error NOT corrected!!\n");
|
||||
else if (atomic_read(&conf->disks[i].rdev->read_errors)
|
||||
> conf->max_nr_stripes)
|
||||
printk("raid5: Too many read errors, failing device.\n");
|
||||
printk(KERN_WARNING
|
||||
"raid5: Too many read errors, failing device.\n");
|
||||
else
|
||||
retry = 1;
|
||||
if (retry)
|
||||
@ -604,7 +605,7 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,
|
||||
*dd_idx = (*pd_idx + 1 + *dd_idx) % raid_disks;
|
||||
break;
|
||||
default:
|
||||
printk("raid5: unsupported algorithm %d\n",
|
||||
printk(KERN_ERR "raid5: unsupported algorithm %d\n",
|
||||
conf->algorithm);
|
||||
}
|
||||
|
||||
@ -645,7 +646,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)
|
||||
i -= (sh->pd_idx + 1);
|
||||
break;
|
||||
default:
|
||||
printk("raid5: unsupported algorithm %d\n",
|
||||
printk(KERN_ERR "raid5: unsupported algorithm %d\n",
|
||||
conf->algorithm);
|
||||
}
|
||||
|
||||
@ -654,7 +655,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)
|
||||
|
||||
check = raid5_compute_sector (r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf);
|
||||
if (check != sh->sector || dummy1 != dd_idx || dummy2 != sh->pd_idx) {
|
||||
printk("compute_blocknr: map not correct\n");
|
||||
printk(KERN_ERR "compute_blocknr: map not correct\n");
|
||||
return 0;
|
||||
}
|
||||
return r_sector;
|
||||
@ -737,7 +738,7 @@ static void compute_block(struct stripe_head *sh, int dd_idx)
|
||||
if (test_bit(R5_UPTODATE, &sh->dev[i].flags))
|
||||
ptr[count++] = p;
|
||||
else
|
||||
printk("compute_block() %d, stripe %llu, %d"
|
||||
printk(KERN_ERR "compute_block() %d, stripe %llu, %d"
|
||||
" not present\n", dd_idx,
|
||||
(unsigned long long)sh->sector, i);
|
||||
|
||||
@ -1005,7 +1006,7 @@ static void handle_stripe(struct stripe_head *sh)
|
||||
if (dev->written) written++;
|
||||
rdev = conf->disks[i].rdev; /* FIXME, should I be looking rdev */
|
||||
if (!rdev || !test_bit(In_sync, &rdev->flags)) {
|
||||
/* The ReadError flag wil just be confusing now */
|
||||
/* The ReadError flag will just be confusing now */
|
||||
clear_bit(R5_ReadError, &dev->flags);
|
||||
clear_bit(R5_ReWrite, &dev->flags);
|
||||
}
|
||||
@ -1288,7 +1289,7 @@ static void handle_stripe(struct stripe_head *sh)
|
||||
* is available
|
||||
*/
|
||||
if (syncing && locked == 0 &&
|
||||
!test_bit(STRIPE_INSYNC, &sh->state) && failed <= 1) {
|
||||
!test_bit(STRIPE_INSYNC, &sh->state)) {
|
||||
set_bit(STRIPE_HANDLE, &sh->state);
|
||||
if (failed == 0) {
|
||||
char *pagea;
|
||||
@ -1306,21 +1307,20 @@ static void handle_stripe(struct stripe_head *sh)
|
||||
if (test_bit(MD_RECOVERY_CHECK, &conf->mddev->recovery))
|
||||
/* don't try to repair!! */
|
||||
set_bit(STRIPE_INSYNC, &sh->state);
|
||||
else {
|
||||
compute_block(sh, sh->pd_idx);
|
||||
uptodate++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!test_bit(STRIPE_INSYNC, &sh->state)) {
|
||||
/* either failed parity check, or recovery is happening */
|
||||
if (failed==0)
|
||||
failed_num = sh->pd_idx;
|
||||
/* should be able to compute the missing block and write it to spare */
|
||||
if (!test_bit(R5_UPTODATE, &sh->dev[failed_num].flags)) {
|
||||
if (uptodate+1 != disks)
|
||||
BUG();
|
||||
compute_block(sh, failed_num);
|
||||
uptodate++;
|
||||
}
|
||||
if (uptodate != disks)
|
||||
BUG();
|
||||
dev = &sh->dev[failed_num];
|
||||
BUG_ON(!test_bit(R5_UPTODATE, &dev->flags));
|
||||
BUG_ON(uptodate != disks);
|
||||
|
||||
set_bit(R5_LOCKED, &dev->flags);
|
||||
set_bit(R5_Wantwrite, &dev->flags);
|
||||
clear_bit(STRIPE_DEGRADED, &sh->state);
|
||||
@ -1822,7 +1822,8 @@ static int run(mddev_t *mddev)
|
||||
struct list_head *tmp;
|
||||
|
||||
if (mddev->level != 5 && mddev->level != 4) {
|
||||
printk("raid5: %s: raid level not set to 4/5 (%d)\n", mdname(mddev), mddev->level);
|
||||
printk(KERN_ERR "raid5: %s: raid level not set to 4/5 (%d)\n",
|
||||
mdname(mddev), mddev->level);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user