diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
| commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
| tree | ad3435c3f57c8222ad61709b716168932f13be6c /mm/bounce.c | |
| parent | 3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (diff) | |
| parent | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (diff) | |
| download | linux-3.10-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.gz linux-3.10-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.bz2 linux-3.10-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip | |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'mm/bounce.c')
| -rw-r--r-- | mm/bounce.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index bf0cf7c8387..e590272fe7a 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -198,8 +198,13 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig, /* * irk, bounce it */ - if (!bio) - bio = bio_alloc(GFP_NOIO, (*bio_orig)->bi_vcnt); + if (!bio) { + unsigned int cnt = (*bio_orig)->bi_vcnt; + + bio = bio_alloc(GFP_NOIO, cnt); + memset(bio->bi_io_vec, 0, cnt * sizeof(struct bio_vec)); + } + to = bio->bi_io_vec + i; |