From bce092c860785c8164bd9b3512531f925652405a Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 6 Jul 2006 10:18:05 +0200 Subject: [PATCH] --- yaml --- r: 32163 b: refs/heads/master c: 1959d21232931dfa686769a21161413f10d6652f h: refs/heads/master i: 32161: 2745cf3bc61647303facc5f81f63b03290fbbb16 32159: 2ae86baeee7586ee848cbf517b318809d5d029c2 v: v3 --- [refs] | 2 +- trunk/block/ll_rw_blk.c | 4 ++-- trunk/include/linux/blktrace_api.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 86762e88fd8d..51ca555a8334 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40359ccb836866435b03a0cb57345002b587d875 +refs/heads/master: 1959d21232931dfa686769a21161413f10d6652f diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c index ab17c7224bb6..61d6b3c65b66 100644 --- a/trunk/block/ll_rw_blk.c +++ b/trunk/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); diff --git a/trunk/include/linux/blktrace_api.h b/trunk/include/linux/blktrace_api.h index 2346a1db8561..7520cc1ff9e2 100644 --- a/trunk/include/linux/blktrace_api.h +++ b/trunk/include/linux/blktrace_api.h @@ -148,7 +148,7 @@ static inline void blk_add_trace_rq(struct request_queue *q, struct request *rq, u32 what) { struct blk_trace *bt = q->blk_trace; - int rw = rq->flags & 0x07; + int rw = rq->flags & 0x03; if (likely(!bt)) return;