aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r--drivers/md/raid1.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b4f4badc0068..f2247b0cd1a7 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -123,6 +123,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
123 goto out_free_pages; 123 goto out_free_pages;
124 124
125 bio->bi_io_vec[i].bv_page = page; 125 bio->bi_io_vec[i].bv_page = page;
126 bio->bi_vcnt = i+1;
126 } 127 }
127 } 128 }
128 /* If not user-requests, copy the page pointers to all bios */ 129 /* If not user-requests, copy the page pointers to all bios */
@@ -138,9 +139,9 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
138 return r1_bio; 139 return r1_bio;
139 140
140out_free_pages: 141out_free_pages:
141 for (i=0; i < RESYNC_PAGES ; i++) 142 for (j=0 ; j < pi->raid_disks; j++)
142 for (j=0 ; j < pi->raid_disks; j++) 143 for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++)
143 safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page); 144 put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
144 j = -1; 145 j = -1;
145out_free_bio: 146out_free_bio:
146 while ( ++j < pi->raid_disks ) 147 while ( ++j < pi->raid_disks )