diff options
| author | Linus Torvalds | 2007-05-08 11:34:52 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-08 11:34:52 -0700 |
| commit | 02a93208edec0d655c9f18613d830dc6afeda7d4 (patch) | |
| tree | 3a48dbae348c02d4b108cb3fcc5f1600ad3dd53a /block | |
| parent | 18062a91d2ddc40e19fc674afeb7cad58cfa23ab (diff) | |
| parent | 821de3a27bf33f11ec878562577c586cd5f83c64 (diff) | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 5873861e1dbb..d99d402953a3 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; } |