|
|
@@ -97,6 +97,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
|
|
struct pool_info *pi = data;
|
|
|
struct r1bio *r1_bio;
|
|
|
struct bio *bio;
|
|
|
+ int need_pages;
|
|
|
int i, j;
|
|
|
|
|
|
r1_bio = r1bio_pool_alloc(gfp_flags, pi);
|
|
|
@@ -119,15 +120,15 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
|
|
* RESYNC_PAGES for each bio.
|
|
|
*/
|
|
|
if (test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery))
|
|
|
- j = pi->raid_disks;
|
|
|
+ need_pages = pi->raid_disks;
|
|
|
else
|
|
|
- j = 1;
|
|
|
- while(j--) {
|
|
|
+ need_pages = 1;
|
|
|
+ for (j = 0; j < need_pages; j++) {
|
|
|
bio = r1_bio->bios[j];
|
|
|
bio->bi_vcnt = RESYNC_PAGES;
|
|
|
|
|
|
if (bio_alloc_pages(bio, gfp_flags))
|
|
|
- goto out_free_bio;
|
|
|
+ goto out_free_pages;
|
|
|
}
|
|
|
/* If not user-requests, copy the page pointers to all bios */
|
|
|
if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {
|
|
|
@@ -141,6 +142,14 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
|
|
|
|
|
return r1_bio;
|
|
|
|
|
|
+out_free_pages:
|
|
|
+ while (--j >= 0) {
|
|
|
+ struct bio_vec *bv;
|
|
|
+
|
|
|
+ bio_for_each_segment_all(bv, r1_bio->bios[j], i)
|
|
|
+ __free_page(bv->bv_page);
|
|
|
+ }
|
|
|
+
|
|
|
out_free_bio:
|
|
|
while (++j < pi->raid_disks)
|
|
|
bio_put(r1_bio->bios[j]);
|