diff options
| author | NeilBrown <neilb@suse.de> | 2010-10-27 00:16:40 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-10-28 02:36:11 -0400 |
| commit | 2b193363ef68667ad717a6723165e0dccf99470f (patch) | |
| tree | bd45d5186f0edf2b546c4503d794b479d126ad1f /drivers/md/raid1.c | |
| parent | 1c4588e9c19cae6209a28c9da2f16a18a610b935 (diff) | |
md: change type of first arg to sync_page_io.
Currently sync_page_io takes a 'bdev'.
Every caller passes 'rdev->bdev'.
We will soon want another field out of the rdev in sync_page_io,
So just pass the rdev instead of the bdev out of it.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 6cb6cae1b386..08c66afea494 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -1382,7 +1382,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) | |||
| 1382 | * active, and resync is currently active | 1382 | * active, and resync is currently active |
| 1383 | */ | 1383 | */ |
| 1384 | rdev = conf->mirrors[d].rdev; | 1384 | rdev = conf->mirrors[d].rdev; |
| 1385 | if (sync_page_io(rdev->bdev, | 1385 | if (sync_page_io(rdev, |
| 1386 | sect + rdev->data_offset, | 1386 | sect + rdev->data_offset, |
| 1387 | s<<9, | 1387 | s<<9, |
| 1388 | bio->bi_io_vec[idx].bv_page, | 1388 | bio->bi_io_vec[idx].bv_page, |
| @@ -1408,7 +1408,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) | |||
| 1408 | continue; | 1408 | continue; |
| 1409 | rdev = conf->mirrors[d].rdev; | 1409 | rdev = conf->mirrors[d].rdev; |
| 1410 | atomic_add(s, &rdev->corrected_errors); | 1410 | atomic_add(s, &rdev->corrected_errors); |
| 1411 | if (sync_page_io(rdev->bdev, | 1411 | if (sync_page_io(rdev, |
| 1412 | sect + rdev->data_offset, | 1412 | sect + rdev->data_offset, |
| 1413 | s<<9, | 1413 | s<<9, |
| 1414 | bio->bi_io_vec[idx].bv_page, | 1414 | bio->bi_io_vec[idx].bv_page, |
| @@ -1423,7 +1423,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) | |||
| 1423 | if (r1_bio->bios[d]->bi_end_io != end_sync_read) | 1423 | if (r1_bio->bios[d]->bi_end_io != end_sync_read) |
| 1424 | continue; | 1424 | continue; |
| 1425 | rdev = conf->mirrors[d].rdev; | 1425 | rdev = conf->mirrors[d].rdev; |
| 1426 | if (sync_page_io(rdev->bdev, | 1426 | if (sync_page_io(rdev, |
| 1427 | sect + rdev->data_offset, | 1427 | sect + rdev->data_offset, |
| 1428 | s<<9, | 1428 | s<<9, |
| 1429 | bio->bi_io_vec[idx].bv_page, | 1429 | bio->bi_io_vec[idx].bv_page, |
| @@ -1507,7 +1507,7 @@ static void fix_read_error(conf_t *conf, int read_disk, | |||
| 1507 | rdev = conf->mirrors[d].rdev; | 1507 | rdev = conf->mirrors[d].rdev; |
| 1508 | if (rdev && | 1508 | if (rdev && |
| 1509 | test_bit(In_sync, &rdev->flags) && | 1509 | test_bit(In_sync, &rdev->flags) && |
| 1510 | sync_page_io(rdev->bdev, | 1510 | sync_page_io(rdev, |
| 1511 | sect + rdev->data_offset, | 1511 | sect + rdev->data_offset, |
| 1512 | s<<9, | 1512 | s<<9, |
| 1513 | conf->tmppage, READ)) | 1513 | conf->tmppage, READ)) |
| @@ -1533,7 +1533,7 @@ static void fix_read_error(conf_t *conf, int read_disk, | |||
| 1533 | rdev = conf->mirrors[d].rdev; | 1533 | rdev = conf->mirrors[d].rdev; |
| 1534 | if (rdev && | 1534 | if (rdev && |
| 1535 | test_bit(In_sync, &rdev->flags)) { | 1535 | test_bit(In_sync, &rdev->flags)) { |
| 1536 | if (sync_page_io(rdev->bdev, | 1536 | if (sync_page_io(rdev, |
| 1537 | sect + rdev->data_offset, | 1537 | sect + rdev->data_offset, |
| 1538 | s<<9, conf->tmppage, WRITE) | 1538 | s<<9, conf->tmppage, WRITE) |
| 1539 | == 0) | 1539 | == 0) |
| @@ -1550,7 +1550,7 @@ static void fix_read_error(conf_t *conf, int read_disk, | |||
| 1550 | rdev = conf->mirrors[d].rdev; | 1550 | rdev = conf->mirrors[d].rdev; |
| 1551 | if (rdev && | 1551 | if (rdev && |
| 1552 | test_bit(In_sync, &rdev->flags)) { | 1552 | test_bit(In_sync, &rdev->flags)) { |
| 1553 | if (sync_page_io(rdev->bdev, | 1553 | if (sync_page_io(rdev, |
| 1554 | sect + rdev->data_offset, | 1554 | sect + rdev->data_offset, |
| 1555 | s<<9, conf->tmppage, READ) | 1555 | s<<9, conf->tmppage, READ) |
| 1556 | == 0) | 1556 | == 0) |