Commit 5e00d1b5 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jens Axboe
Browse files

BLOCK: fix bio.bi_rw handling 



Return of the bi_rw tests is no longer bool after commit 74450be1. But
results of such tests are stored in bools. This doesn't fit in there
for some compilers (gcc 4.5 here), so either use !! magic to get real
bools or use ulong where the result is assigned somewhere.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent c87ffbb8

block/blk-core.c

+3 −3
Original line number Diff line number Diff line
@@ -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) &&

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE