git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: fix filehandle comment
[safe/jmp/linux-2.6]
/
mm
/
bounce.c
diff --git
a/mm/bounce.c
b/mm/bounce.c
index
bf0cf7c
..
a2b76a5
100644
(file)
--- a/
mm/bounce.c
+++ b/
mm/bounce.c
@@
-13,17
+13,15
@@
#include <linux/init.h>
#include <linux/hash.h>
#include <linux/highmem.h>
#include <linux/init.h>
#include <linux/hash.h>
#include <linux/highmem.h>
-#include <linux/blktrace_api.h>
-#include <trace/block.h>
#include <asm/tlbflush.h>
#include <asm/tlbflush.h>
+#include <trace/events/block.h>
+
#define POOL_SIZE 64
#define ISA_POOL_SIZE 16
static mempool_t *page_pool, *isa_page_pool;
#define POOL_SIZE 64
#define ISA_POOL_SIZE 16
static mempool_t *page_pool, *isa_page_pool;
-DEFINE_TRACE(block_bio_bounce);
-
#ifdef CONFIG_HIGHMEM
static __init int init_emergency_pool(void)
{
#ifdef CONFIG_HIGHMEM
static __init int init_emergency_pool(void)
{
@@
-192,14
+190,19
@@
static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
/*
* is destination page below bounce pfn?
*/
/*
* is destination page below bounce pfn?
*/
- if (page_to_pfn(page) <= q
->bounce_pfn
)
+ if (page_to_pfn(page) <= q
ueue_bounce_pfn(q)
)
continue;
/*
* irk, bounce it
*/
continue;
/*
* 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;
to = bio->bi_io_vec + i;
@@
-279,7
+282,7
@@
void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig)
* don't waste time iterating over bio segments
*/
if (!(q->bounce_gfp & GFP_DMA)) {
* don't waste time iterating over bio segments
*/
if (!(q->bounce_gfp & GFP_DMA)) {
- if (q
->bounce_pfn
>= blk_max_pfn)
+ if (q
ueue_bounce_pfn(q)
>= blk_max_pfn)
return;
pool = page_pool;
} else {
return;
pool = page_pool;
} else {