diff options
| author | Linus Torvalds | 2009-04-06 22:46:27 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-06 22:46:27 +0200 |
| commit | 8e320d02718d2872d52ef88a69a493e420494269 (patch) | |
| tree | 13f33e94375ae53e235454706642c6e01b258155 | |
| parent | percpu: __percpu_depopulate_mask can take a const mask (diff) | |
| parent | md/raid1 - don't assume newly allocated bvecs are initialised. (diff) | |
| download | kernel-qcow2-linux-8e320d02718d2872d52ef88a69a493e420494269.tar.gz kernel-qcow2-linux-8e320d02718d2872d52ef88a69a493e420494269.tar.xz kernel-qcow2-linux-8e320d02718d2872d52ef88a69a493e420494269.zip | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid1 - don't assume newly allocated bvecs are initialised.
| -rw-r--r-- | drivers/md/raid1.c | 7 |
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) goto out_free_pages; bio->bi_io_vec[i].bv_page = page; + bio->bi_vcnt = i+1; } } /* 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) return r1_bio; out_free_pages: - for (i=0; i < RESYNC_PAGES ; i++) - for (j=0 ; j < pi->raid_disks; j++) - safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page); + for (j=0 ; j < pi->raid_disks; j++) + for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++) + put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page); j = -1; out_free_bio: while ( ++j < pi->raid_disks ) |