block: use proper return value from bio_failfast()

[linux-2.6-block.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 30e4a99c2276b845b680fcb20f37a0a3d25ad006..808b58129d3e4d91c844dd2ca629e368c5b810ad 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -757,7 +757,7 @@ void blk_rq_set_mixed_merge(struct request *rq)
        rq->rq_flags |= RQF_MIXED_MERGE;
 }
 
-static inline unsigned int bio_failfast(const struct bio *bio)
+static inline blk_opf_t bio_failfast(const struct bio *bio)
 {
        if (bio->bi_opf & REQ_RAHEAD)
                return REQ_FAILFAST_MASK;