diff options
| -rw-r--r-- | drivers/md/raid10.c | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index ddc1dfc4d3d2..1440935414e6 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1407,36 +1407,45 @@ static void raid10d(mddev_t *mddev) | |||
| 1407 | if (s > (PAGE_SIZE>>9)) | 1407 | if (s > (PAGE_SIZE>>9)) |
| 1408 | s = PAGE_SIZE >> 9; | 1408 | s = PAGE_SIZE >> 9; |
| 1409 | 1409 | ||
| 1410 | rcu_read_lock(); | ||
| 1410 | do { | 1411 | do { |
| 1411 | int d = r10_bio->devs[sl].devnum; | 1412 | int d = r10_bio->devs[sl].devnum; |
| 1412 | rdev = conf->mirrors[d].rdev; | 1413 | rdev = rcu_dereference(conf->mirrors[d].rdev); |
| 1413 | if (rdev && | 1414 | if (rdev && |
| 1414 | test_bit(In_sync, &rdev->flags) && | 1415 | test_bit(In_sync, &rdev->flags)) { |
| 1415 | sync_page_io(rdev->bdev, | 1416 | atomic_inc(&rdev->nr_pending); |
| 1416 | r10_bio->devs[sl].addr + | 1417 | rcu_read_unlock(); |
| 1417 | sect + rdev->data_offset, | 1418 | success = sync_page_io(rdev->bdev, |
| 1418 | s<<9, | 1419 | r10_bio->devs[sl].addr + |
| 1419 | conf->tmppage, READ)) | 1420 | sect + rdev->data_offset, |
| 1420 | success = 1; | 1421 | s<<9, |
| 1421 | else { | 1422 | conf->tmppage, READ); |
| 1422 | sl++; | 1423 | rdev_dec_pending(rdev, mddev); |
| 1423 | if (sl == conf->copies) | 1424 | rcu_read_lock(); |
| 1424 | sl = 0; | 1425 | if (success) |
| 1426 | break; | ||
| 1425 | } | 1427 | } |
| 1428 | sl++; | ||
| 1429 | if (sl == conf->copies) | ||
| 1430 | sl = 0; | ||
| 1426 | } while (!success && sl != r10_bio->read_slot); | 1431 | } while (!success && sl != r10_bio->read_slot); |
| 1432 | rcu_read_unlock(); | ||
| 1427 | 1433 | ||
| 1428 | if (success) { | 1434 | if (success) { |
| 1429 | int start = sl; | 1435 | int start = sl; |
| 1430 | /* write it back and re-read */ | 1436 | /* write it back and re-read */ |
| 1437 | rcu_read_lock(); | ||
| 1431 | while (sl != r10_bio->read_slot) { | 1438 | while (sl != r10_bio->read_slot) { |
| 1432 | int d; | 1439 | int d; |
| 1433 | if (sl==0) | 1440 | if (sl==0) |
| 1434 | sl = conf->copies; | 1441 | sl = conf->copies; |
| 1435 | sl--; | 1442 | sl--; |
| 1436 | d = r10_bio->devs[sl].devnum; | 1443 | d = r10_bio->devs[sl].devnum; |
| 1437 | rdev = conf->mirrors[d].rdev; | 1444 | rdev = rcu_dereference(conf->mirrors[d].rdev); |
| 1438 | if (rdev && | 1445 | if (rdev && |
| 1439 | test_bit(In_sync, &rdev->flags)) { | 1446 | test_bit(In_sync, &rdev->flags)) { |
| 1447 | atomic_inc(&rdev->nr_pending); | ||
| 1448 | rcu_read_unlock(); | ||
| 1440 | atomic_add(s, &rdev->corrected_errors); | 1449 | atomic_add(s, &rdev->corrected_errors); |
| 1441 | if (sync_page_io(rdev->bdev, | 1450 | if (sync_page_io(rdev->bdev, |
| 1442 | r10_bio->devs[sl].addr + | 1451 | r10_bio->devs[sl].addr + |
| @@ -1444,6 +1453,8 @@ static void raid10d(mddev_t *mddev) | |||
| 1444 | s<<9, conf->tmppage, WRITE) == 0) | 1453 | s<<9, conf->tmppage, WRITE) == 0) |
| 1445 | /* Well, this device is dead */ | 1454 | /* Well, this device is dead */ |
| 1446 | md_error(mddev, rdev); | 1455 | md_error(mddev, rdev); |
| 1456 | rdev_dec_pending(rdev, mddev); | ||
| 1457 | rcu_read_lock(); | ||
| 1447 | } | 1458 | } |
| 1448 | } | 1459 | } |
| 1449 | sl = start; | 1460 | sl = start; |
| @@ -1453,17 +1464,22 @@ static void raid10d(mddev_t *mddev) | |||
| 1453 | sl = conf->copies; | 1464 | sl = conf->copies; |
| 1454 | sl--; | 1465 | sl--; |
| 1455 | d = r10_bio->devs[sl].devnum; | 1466 | d = r10_bio->devs[sl].devnum; |
| 1456 | rdev = conf->mirrors[d].rdev; | 1467 | rdev = rcu_dereference(conf->mirrors[d].rdev); |
| 1457 | if (rdev && | 1468 | if (rdev && |
| 1458 | test_bit(In_sync, &rdev->flags)) { | 1469 | test_bit(In_sync, &rdev->flags)) { |
| 1470 | atomic_inc(&rdev->nr_pending); | ||
| 1471 | rcu_read_unlock(); | ||
| 1459 | if (sync_page_io(rdev->bdev, | 1472 | if (sync_page_io(rdev->bdev, |
| 1460 | r10_bio->devs[sl].addr + | 1473 | r10_bio->devs[sl].addr + |
| 1461 | sect + rdev->data_offset, | 1474 | sect + rdev->data_offset, |
| 1462 | s<<9, conf->tmppage, READ) == 0) | 1475 | s<<9, conf->tmppage, READ) == 0) |
| 1463 | /* Well, this device is dead */ | 1476 | /* Well, this device is dead */ |
| 1464 | md_error(mddev, rdev); | 1477 | md_error(mddev, rdev); |
| 1478 | rdev_dec_pending(rdev, mddev); | ||
| 1479 | rcu_read_lock(); | ||
| 1465 | } | 1480 | } |
| 1466 | } | 1481 | } |
| 1482 | rcu_read_unlock(); | ||
| 1467 | } else { | 1483 | } else { |
| 1468 | /* Cannot read from anywhere -- bye bye array */ | 1484 | /* Cannot read from anywhere -- bye bye array */ |
| 1469 | md_error(mddev, conf->mirrors[r10_bio->devs[r10_bio->read_slot].devnum].rdev); | 1485 | md_error(mddev, conf->mirrors[r10_bio->devs[r10_bio->read_slot].devnum].rdev); |