linux-kernel - [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <47D5E1ED.3020804@tiscali.nl>
Date:	Tue, 11 Mar 2008 02:35:41 +0100
From:	Roel Kluin <12o3l@...cali.nl>
To:	jens.axboe@...cle.com
CC:	lkml <linux-kernel@...r.kernel.org>
Subject: [PATCH] block/blk-merge.c: inverted likeliness in ll_back_merge_fn()

In my likely profile it appears this one is inverted.
---
Invert likeliness

Signed-off-by: Roel Kluin <12o3l@...cali.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))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/