diff options
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index aacf6bf352d8..af6681b19776 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -1097,8 +1097,8 @@ read_again: | |||
1097 | r1_bio->read_disk = rdisk; | 1097 | r1_bio->read_disk = rdisk; |
1098 | 1098 | ||
1099 | read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev); | 1099 | read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev); |
1100 | md_trim_bio(read_bio, r1_bio->sector - bio->bi_sector, | 1100 | bio_trim(read_bio, r1_bio->sector - bio->bi_sector, |
1101 | max_sectors); | 1101 | max_sectors); |
1102 | 1102 | ||
1103 | r1_bio->bios[rdisk] = read_bio; | 1103 | r1_bio->bios[rdisk] = read_bio; |
1104 | 1104 | ||
@@ -1266,7 +1266,7 @@ read_again: | |||
1266 | continue; | 1266 | continue; |
1267 | 1267 | ||
1268 | mbio = bio_clone_mddev(bio, GFP_NOIO, mddev); | 1268 | mbio = bio_clone_mddev(bio, GFP_NOIO, mddev); |
1269 | md_trim_bio(mbio, r1_bio->sector - bio->bi_sector, max_sectors); | 1269 | bio_trim(mbio, r1_bio->sector - bio->bi_sector, max_sectors); |
1270 | 1270 | ||
1271 | if (first_clone) { | 1271 | if (first_clone) { |
1272 | /* do behind I/O ? | 1272 | /* do behind I/O ? |
@@ -2126,7 +2126,7 @@ static int narrow_write_error(struct r1bio *r1_bio, int i) | |||
2126 | wbio->bi_sector = r1_bio->sector; | 2126 | wbio->bi_sector = r1_bio->sector; |
2127 | wbio->bi_size = r1_bio->sectors << 9; | 2127 | wbio->bi_size = r1_bio->sectors << 9; |
2128 | 2128 | ||
2129 | md_trim_bio(wbio, sector - r1_bio->sector, sectors); | 2129 | bio_trim(wbio, sector - r1_bio->sector, sectors); |
2130 | wbio->bi_sector += rdev->data_offset; | 2130 | wbio->bi_sector += rdev->data_offset; |
2131 | wbio->bi_bdev = rdev->bdev; | 2131 | wbio->bi_bdev = rdev->bdev; |
2132 | if (submit_bio_wait(WRITE, wbio) == 0) | 2132 | if (submit_bio_wait(WRITE, wbio) == 0) |
@@ -2241,7 +2241,7 @@ read_more: | |||
2241 | } | 2241 | } |
2242 | r1_bio->read_disk = disk; | 2242 | r1_bio->read_disk = disk; |
2243 | bio = bio_clone_mddev(r1_bio->master_bio, GFP_NOIO, mddev); | 2243 | bio = bio_clone_mddev(r1_bio->master_bio, GFP_NOIO, mddev); |
2244 | md_trim_bio(bio, r1_bio->sector - bio->bi_sector, max_sectors); | 2244 | bio_trim(bio, r1_bio->sector - bio->bi_sector, max_sectors); |
2245 | r1_bio->bios[r1_bio->read_disk] = bio; | 2245 | r1_bio->bios[r1_bio->read_disk] = bio; |
2246 | rdev = conf->mirrors[disk].rdev; | 2246 | rdev = conf->mirrors[disk].rdev; |
2247 | printk_ratelimited(KERN_ERR | 2247 | printk_ratelimited(KERN_ERR |