Messages in this thread Patch in this message | | | Date | Tue, 11 Mar 2008 09:18:09 +0100 | From | Roel Kluin <> | Subject | Re: [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn() |
| |
Jens Axboe wrote: > On Tue, Mar 11 2008, Roel Kluin wrote: >> In my likely profile it appears this one is inverted. > > Depends entirely on the workload, it should be removed rather than > inverted. > --- Signed-off-by: Roel Kluin <12o3l@tiscali.nl> --- diff --git a/block/blk-merge.c b/block/blk-merge.c index 0f58616..7651c3b 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -305,7 +305,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, } if (unlikely(!bio_flagged(req->biotail, BIO_SEG_VALID))) blk_recount_segments(q, req->biotail); - if (unlikely(!bio_flagged(bio, BIO_SEG_VALID))) + if (!bio_flagged(bio, BIO_SEG_VALID)) blk_recount_segments(q, bio); len = req->biotail->bi_hw_back_size + bio->bi_hw_front_size; if (BIOVEC_VIRT_MERGEABLE(__BVEC_END(req->biotail), __BVEC_START(bio))
| |