Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

[linux-beck.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index ddc68332d65568a0438b36007e4ff868ca55cf84..500eb859886e7ec989b2b1dc731eccc8d58dc85b 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1214,9 +1214,9 @@ static int __make_request(struct request_queue *q, struct bio *bio)
        int el_ret;
        unsigned int bytes = bio->bi_size;
        const unsigned short prio = bio_prio(bio);
-       const bool sync = (bio->bi_rw & REQ_SYNC);
-       const bool unplug = (bio->bi_rw & REQ_UNPLUG);
-       const unsigned int ff = bio->bi_rw & REQ_FAILFAST_MASK;
+       const bool sync = !!(bio->bi_rw & REQ_SYNC);
+       const bool unplug = !!(bio->bi_rw & REQ_UNPLUG);
+       const unsigned long ff = bio->bi_rw & REQ_FAILFAST_MASK;
        int rw_flags;
 
        if ((bio->bi_rw & REQ_HARDBARRIER) &&