From c4e40779523ab3f2e92890bc58851c71240995a8 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 12 Aug 2010 14:31:06 +0200 Subject: [PATCH] --- yaml --- r: 210519 b: refs/heads/master c: 5e00d1b5b4c10fb839afd5ce61db8e24339454b0 h: refs/heads/master i: 210517: 23c6317ac67580a6db10d14b0551a60bd9842282 210515: 41a5434402dafbec7da2a6aaab358d361debe679 210511: a5afb6cab74443f6b137189063fbf5d36dc219c8 v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 6 +++--- trunk/drivers/block/loop.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1466ace96696..9d6253dc0cf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c87ffbb812cf6150097a5095b031f4013a8f78a5 +refs/heads/master: 5e00d1b5b4c10fb839afd5ce61db8e24339454b0 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index ee1a1e7e63cc..32a1c123dfb3 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -1198,9 +1198,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) && diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c index f3c636d23718..91797bbbe702 100644 --- a/trunk/drivers/block/loop.c +++ b/trunk/drivers/block/loop.c @@ -477,7 +477,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio) pos = ((loff_t) bio->bi_sector << 9) + lo->lo_offset; if (bio_rw(bio) == WRITE) { - bool barrier = (bio->bi_rw & REQ_HARDBARRIER); + bool barrier = !!(bio->bi_rw & REQ_HARDBARRIER); struct file *file = lo->lo_backing_file; if (barrier) {