linux-kernel - [PATCH] block: Remove judgement for rq_mergeable(rq) in func elv_rqhash

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>] [day] [month] [year] [list]

Message-ID: <201301071044518395740@gmail.com>
Date:	Mon, 7 Jan 2013 10:44:56 +0800
From:	majianpeng <majianpeng@...il.com>
To:	axboe <axboe@...nel.dk>
Cc:	linux-kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH] block: Remove judgement for rq_mergeable(rq) in func elv_rqhash_find.

Because only mergeable rq can add rqhash.So it does not make sense to
judge rq_mergeable(rq) in func elv_rqhash_find.

Signed-off-by: Jianpeng Ma <majianpeng@...il.com>
---
 block/elevator.c |    5 -----
 1 file changed, 5 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 9edba1b..d5901a4 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -273,11 +273,6 @@ static struct request *elv_rqhash_find(struct request_queue *q, sector_t offset)
 	hlist_for_each_entry_safe(rq, entry, next, hash_list, hash) {
 		BUG_ON(!ELV_ON_HASH(rq));

-		if (unlikely(!rq_mergeable(rq))) {
-			__elv_rqhash_del(rq);
-			continue;
-		}
-
 		if (rq_hash_key(rq) == offset)
 			return rq;
 	}
-- 
1.7.9.5