aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:34:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:34:52 -0700
commit02a93208edec0d655c9f18613d830dc6afeda7d4 (patch)
tree3a48dbae348c02d4b108cb3fcc5f1600ad3dd53a /block
parent18062a91d2ddc40e19fc674afeb7cad58cfa23ab (diff)
parent821de3a27bf33f11ec878562577c586cd5f83c64 (diff)
downloadmrst-s0i3-test-02a93208edec0d655c9f18613d830dc6afeda7d4.tar.gz
mrst-s0i3-test-02a93208edec0d655c9f18613d830dc6afeda7d4.tar.xz
mrst-s0i3-test-02a93208edec0d655c9f18613d830dc6afeda7d4.zip
Merge branch 'for-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block: [PATCH] ll_rw_blk: fix missing bounce in blk_rq_map_kern() [PATCH] splice: always call into page_cache_readahead() [PATCH] splice(): fix interaction with readahead
Diffstat (limited to 'block')
-rw-r--r--block/ll_rw_blk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 5873861e1db..d99d402953a 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -2558,6 +2558,7 @@ int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf,
bio->bi_rw |= (1 << BIO_RW);
blk_rq_bio_prep(q, rq, bio);
+ blk_queue_bounce(q, &rq->bio);
rq->buffer = rq->data = NULL;
return 0;
}