block: unify flags for struct bio and struct request

[net-next-2.6.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index aa99b59c03d6748c17e948687a9e38a08c4224a4..816a7c8d6394257d89fb36bd67c6b01a62d92020 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -79,8 +79,7 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)
        /*
         * Don't merge file system requests and discard requests
         */
-       if (bio_rw_flagged(bio, BIO_RW_DISCARD) !=
-           bio_rw_flagged(rq->bio, BIO_RW_DISCARD))
+       if ((bio->bi_rw & REQ_DISCARD) != (rq->bio->bi_rw & REQ_DISCARD))
                return 0;
 
        /*