diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 15:49:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-09 15:49:36 -0700 |
commit | 84e74f6b770efe7c9beb604118695aa311b969f5 (patch) | |
tree | a242b29d44b85e510481232b09b2371572570ff8 /block/ll_rw_blk.c | |
parent | 953969ddf5b049361ed1e8471cc43dc4134d2a6f (diff) | |
parent | 1959d21232931dfa686769a21161413f10d6652f (diff) |
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Only the first two bits in bio->bi_rw and rq->flags match
[PATCH] blktrace: readahead support
[PATCH] blktrace: fix barrier vs sync typo
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index ab17c7224bb..61d6b3c65b6 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -3491,8 +3491,8 @@ EXPORT_SYMBOL(end_request); void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio) { - /* first three bits are identical in rq->flags and bio->bi_rw */ - rq->flags |= (bio->bi_rw & 7); + /* first two bits are identical in rq->flags and bio->bi_rw */ + rq->flags |= (bio->bi_rw & 3); rq->nr_phys_segments = bio_phys_segments(q, bio); rq->nr_hw_segments = bio_hw_segments(q, bio); |