apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

md/raid5: fix handling of bad blocks during recovery.

Browse Source 
1/ We can only treat a known-bad-block like a read-error if we
   have the data that belongs in that block.  So fix that test.

2/ If we cannot recovery a stripe due to insufficient data,
   don't tell "md_done_sync" that the sync failed unless we really
   did fail something.  If we successfully record bad blocks,
   that is success.

Reported-by: "majianpeng" <majianpeng@gmail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown
2012-04-01 23:48:38 +10:00
parent 5220ea1e64
commit 18b9837ea0
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/md/raid5.c
+29 -26
View File
@@ -2471,39 +2471,41 @@ handle_failed_sync(struct r5conf *conf, struct stripe_head *sh,
int abort = 0; int abort = 0;
int i; int i;
md_done_sync(conf->mddev, STRIPE_SECTORS, 0);
clear_bit(STRIPE_SYNCING, &sh->state); clear_bit(STRIPE_SYNCING, &sh->state);
s->syncing = 0; s->syncing = 0;
s->replacing = 0; s->replacing = 0;
/* There is nothing more to do for sync/check/repair. /* There is nothing more to do for sync/check/repair.
* Don't even need to abort as that is handled elsewhere
* if needed, and not always wanted e.g. if there is a known
* bad block here.
* For recover/replace we need to record a bad block on all * For recover/replace we need to record a bad block on all
* non-sync devices, or abort the recovery * non-sync devices, or abort the recovery
*/ */
if (!test_bit(MD_RECOVERY_RECOVER, &conf->mddev->recovery)) if (test_bit(MD_RECOVERY_RECOVER, &conf->mddev->recovery)) {
return; /* During recovery devices cannot be removed, so
/* During recovery devices cannot be removed, so locking and * locking and refcounting of rdevs is not needed
* refcounting of rdevs is not needed */
*/ for (i = 0; i < conf->raid_disks; i++) {
for (i = 0; i < conf->raid_disks; i++) { struct md_rdev *rdev = conf->disks[i].rdev;
struct md_rdev *rdev = conf->disks[i].rdev; if (rdev
if (rdev && !test_bit(Faulty, &rdev->flags)
&& !test_bit(Faulty, &rdev->flags) && !test_bit(In_sync, &rdev->flags)
&& !test_bit(In_sync, &rdev->flags) && !rdev_set_badblocks(rdev, sh->sector,
&& !rdev_set_badblocks(rdev, sh->sector, STRIPE_SECTORS, 0))
STRIPE_SECTORS, 0)) abort = 1;
abort = 1; rdev = conf->disks[i].replacement;
rdev = conf->disks[i].replacement; if (rdev
if (rdev && !test_bit(Faulty, &rdev->flags)
&& !test_bit(Faulty, &rdev->flags) && !test_bit(In_sync, &rdev->flags)
&& !test_bit(In_sync, &rdev->flags) && !rdev_set_badblocks(rdev, sh->sector,
&& !rdev_set_badblocks(rdev, sh->sector, STRIPE_SECTORS, 0))
STRIPE_SECTORS, 0)) abort = 1;
abort = 1; }
} if (abort)
if (abort) { conf->recovery_disabled =
conf->recovery_disabled = conf->mddev->recovery_disabled; conf->mddev->recovery_disabled;
set_bit(MD_RECOVERY_INTR, &conf->mddev->recovery);
} }
md_done_sync(conf->mddev, STRIPE_SECTORS, !abort);
} }
static int want_replace(struct stripe_head *sh, int disk_idx) static int want_replace(struct stripe_head *sh, int disk_idx)
@@ -3203,7 +3205,8 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
/* Not in-sync */; /* Not in-sync */;
else if (is_bad) { else if (is_bad) {
/* also not in-sync */ /* also not in-sync */
if (!test_bit(WriteErrorSeen, &rdev->flags)) { if (!test_bit(WriteErrorSeen, &rdev->flags) &&
test_bit(R5_UPTODATE, &dev->flags)) {
/* treat as in-sync, but with a read error /* treat as in-sync, but with a read error
* which we can now try to correct * which we can now try to correct
*/ */