From b35ccbcbac08cad87bd94735a6bc741887e4bb45 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 16 Jul 2009 15:26:55 +0900 Subject: [PATCH] --- yaml --- r: 155683 b: refs/heads/master c: 0a09f4319c6d88c732ed46735f8584bbb95cac65 h: refs/heads/master i: 155681: cf4874441bf718b2c8ddcd973f5562728a8cbff5 155679: 0a4d27721cc6aabfb091ab59a41b524ad5af0a0e v: v3 --- [refs] | 2 +- trunk/block/elevator.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bbb74e761c9a..a09474fa775f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9d4bc289cd1cd43c3cff97b73efe2b0b5098a92 +refs/heads/master: 0a09f4319c6d88c732ed46735f8584bbb95cac65 diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index 6f2375339a99..2d511f9105e1 100644 --- a/trunk/block/elevator.c +++ b/trunk/block/elevator.c @@ -101,11 +101,16 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio) return 0; /* - * Don't merge if failfast settings don't match + * Don't merge if failfast settings don't match. + * + * FIXME: The negation in front of each condition is necessary + * because bio and request flags use different bit positions + * and the accessors return those bits directly. This + * ugliness will soon go away. */ - if (bio_failfast_dev(bio) != blk_failfast_dev(rq) || - bio_failfast_transport(bio) != blk_failfast_transport(rq) || - bio_failfast_driver(bio) != blk_failfast_driver(rq)) + if (!bio_failfast_dev(bio) != !blk_failfast_dev(rq) || + !bio_failfast_transport(bio) != !blk_failfast_transport(rq) || + !bio_failfast_driver(bio) != !blk_failfast_driver(rq)) return 0; if (!elv_iosched_allow_merge(rq, bio))