LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn()
@ 2008-03-11 1:35 Roel Kluin
2008-03-11 6:11 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Roel Kluin @ 2008-03-11 1:35 UTC (permalink / raw)
To: jens.axboe; +Cc: lkml
In my likely profile it appears this one is inverted.
---
Invert likeliness
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
---
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 0f58616..b17777a 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 (likely(!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))
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn()
2008-03-11 1:35 [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn() Roel Kluin
@ 2008-03-11 6:11 ` Jens Axboe
2008-03-11 8:18 ` Roel Kluin
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2008-03-11 6:11 UTC (permalink / raw)
To: Roel Kluin; +Cc: lkml
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.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn()
2008-03-11 6:11 ` Jens Axboe
@ 2008-03-11 8:18 ` Roel Kluin
0 siblings, 0 replies; 3+ messages in thread
From: Roel Kluin @ 2008-03-11 8:18 UTC (permalink / raw)
To: Jens Axboe; +Cc: lkml
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))
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-11 8:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-11 1:35 [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn() Roel Kluin
2008-03-11 6:11 ` Jens Axboe
2008-03-11 8:18 ` Roel Kluin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).