[PATCH] Only the first two bits in bio->bi_rw and rq->flags match

Not three, as assumed. This causes the barrier bit to be needlessly set
for some IO.

Signed-off-by: Jens Axboe <axboe@suse.de>

diff --cc block/ll_rw_blk.c
Simple merge

diff --cc include/linux/blktrace_api.h
Simple merge