|
@@ -142,10 +142,13 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
|
|
}
|
|
|
/* If not user-requests, copy the page pointers to all bios */
|
|
|
if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {
|
|
|
- for (i=0; i<RESYNC_PAGES ; i++)
|
|
|
- for (j=1; j<pi->raid_disks; j++)
|
|
|
- r1_bio->bios[j]->bi_io_vec[i].bv_page =
|
|
|
+ for (i = 0; i< RESYNC_PAGES; i++)
|
|
|
+ for (j = 1; j < pi->raid_disks; j++) {
|
|
|
+ struct page *page =
|
|
|
r1_bio->bios[0]->bi_io_vec[i].bv_page;
|
|
|
+ get_page(page);
|
|
|
+ r1_bio->bios[j]->bi_io_vec[i].bv_page = page;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
r1_bio->master_bio = NULL;
|
|
@@ -170,12 +173,8 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
|
|
|
struct r1bio *r1bio = __r1_bio;
|
|
|
|
|
|
for (i = 0; i < RESYNC_PAGES; i++)
|
|
|
- for (j = pi->raid_disks; j-- ;) {
|
|
|
- if (j == 0 ||
|
|
|
- r1bio->bios[j]->bi_io_vec[i].bv_page !=
|
|
|
- r1bio->bios[0]->bi_io_vec[i].bv_page)
|
|
|
- safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
|
|
|
- }
|
|
|
+ for (j = pi->raid_disks; j-- ;)
|
|
|
+ safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
|
|
|
for (i=0 ; i < pi->raid_disks; i++)
|
|
|
bio_put(r1bio->bios[i]);
|
|
|
|