From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552Ab3AGFI3 (ORCPT ); Mon, 7 Jan 2013 00:08:29 -0500 Received: from mail-da0-f44.google.com ([209.85.210.44]:65477 "EHLO mail-da0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781Ab3AGFI0 (ORCPT ); Mon, 7 Jan 2013 00:08:26 -0500 Date: Mon, 7 Jan 2013 13:08:19 +0800 From: majianpeng To: axboe Cc: linux-kernel Reply-To: majianpeng Subject: [PATCH] block: Remove judgement for rq_mergeable(rq) in func elv_rqhash_find. X-Priority: 3 X-GUID: 86884D30-699E-4BBA-A634-ACC3440583F4 X-Has-Attach: no X-Mailer: Foxmail 7.0.1.90[en] Mime-Version: 1.0 Message-ID: <201301071308168882920@gmail.com> Content-Type: text/plain; charset="gb2312" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r0758YBe025375 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 --- 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{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I