diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /block/ll_rw_blk.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
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 ab17c7224bb6..61d6b3c65b66 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -3491,8 +3491,8 @@ EXPORT_SYMBOL(end_request); | |||
| 3491 | 3491 | ||
| 3492 | void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio) | 3492 | void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio) |
| 3493 | { | 3493 | { |
| 3494 | /* first three bits are identical in rq->flags and bio->bi_rw */ | 3494 | /* first two bits are identical in rq->flags and bio->bi_rw */ |
| 3495 | rq->flags |= (bio->bi_rw & 7); | 3495 | rq->flags |= (bio->bi_rw & 3); |
| 3496 | 3496 | ||
| 3497 | rq->nr_phys_segments = bio_phys_segments(q, bio); | 3497 | rq->nr_phys_segments = bio_phys_segments(q, bio); |
| 3498 | rq->nr_hw_segments = bio_hw_segments(q, bio); | 3498 | rq->nr_hw_segments = bio_hw_segments(q, bio); |