From patchwork Wed Oct 31 17:59:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10663131 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45DA13E9D for ; Wed, 31 Oct 2018 18:00:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36EDF2B4F7 for ; Wed, 31 Oct 2018 18:00:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B1F42B504; Wed, 31 Oct 2018 18:00:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3E172B515 for ; Wed, 31 Oct 2018 18:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730220AbeKAC71 (ORCPT ); Wed, 31 Oct 2018 22:59:27 -0400 Received: from mail-it1-f193.google.com ([209.85.166.193]:37510 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730216AbeKAC71 (ORCPT ); Wed, 31 Oct 2018 22:59:27 -0400 Received: by mail-it1-f193.google.com with SMTP id e74-v6so19550011ita.2 for ; Wed, 31 Oct 2018 11:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FS5c/SffmP4Mo5k8HAlOlXFCjUoVNd2qr5BWZEsMEe4=; b=tNDh3sOcKDmvrZ1JB1nd7dx6eHRJe4Jw4WaGyU4oj68q8dEidUkM51Z/b5sAuvtaxo 42XxcfuUp4QDue0o3f1pctFW7wwK3bdFe8V/1c8ixnuI7JhQ8G8wQzSAfgbMS3pLivDB GI34kTlR9v4jAYJSSpIIKdqFW7+bCjD+MRiGboW2WJTzyibIuE4RyxJve8nktRQEhKbW r9rgFK1tvJrUn5TtlyhxCDXLwJQxVtRr4rcaWOMmciSFbd66M48KsWQoIzfH6wi74lOQ 7Px4fDFowy2LQrTUlygG8+c+X84yuGyuTr83dmsQHzErr4LM2XJqB6yw578gxJWArIst 0qRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FS5c/SffmP4Mo5k8HAlOlXFCjUoVNd2qr5BWZEsMEe4=; b=oKCvtMaS9Y5VJ2n+EssJ6cjoLqmvGGUsJlKH6xp3rS+YSXLboEP9vzaG3z7QtvzyAw JANUOeEw33i0S2VYj6Jv2byCo9Gh7VzMrgm2EKHaF6qnEd2YVJKvXO9Nubdgv8HRfkMn EewGl4ZyA1Jup2WkWAcWVFyI8tEHKXqt3vNr2DU4WGdzdJW2K3ApsBd30dBuepcmH3gv Rddm4ngM8qt8g4wOp4c15MtbdRulzgW5pgUkiSUUOnRpJtbCUEbdQMdKVUDAfWoG3/Z6 n00wqsm1prJd8lgvhJIQ/t7jl/WBydgNOTLuLs6TILbRSHllmQfVIgMwFKC8dCTXiE+s TrSg== X-Gm-Message-State: AGRZ1gJipTn5cEbc/xPofm8HCKJLUzWTwm7mt9PSE6WZwxwyMMORgvp/ GtZ+BMw+3zwPkZo1iTqzQBfDeg== X-Google-Smtp-Source: AJdET5dVMAwgFIHU42G7dHvmbNHtU4FlmvLJY2MFBYfTX3g8aolMslA+iZQqCZ923gkAYtnGIVt99Q== X-Received: by 2002:a24:98d4:: with SMTP id n203-v6mr2765551itd.172.1541008822420; Wed, 31 Oct 2018 11:00:22 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id 197-v6sm10982947iou.87.2018.10.31.11.00.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 11:00:21 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 28/30] blk-merge: kill dead queue lock held check Date: Wed, 31 Oct 2018 11:59:20 -0600 Message-Id: <20181031175922.8849-29-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031175922.8849-1-axboe@kernel.dk> References: <20181031175922.8849-1-axboe@kernel.dk> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is dead code, any queue reaching this part has mq_ops attached. Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe --- block/blk-merge.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 3561dcce2260..0128284bded4 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -704,9 +704,6 @@ static void blk_account_io_merge(struct request *req) static struct request *attempt_merge(struct request_queue *q, struct request *req, struct request *next) { - if (!q->mq_ops) - lockdep_assert_held(q->queue_lock); - if (!rq_mergeable(req) || !rq_mergeable(next)) return NULL;