From patchwork Mon Oct 29 16:34:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10659671 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 9CC8013B5 for ; Mon, 29 Oct 2018 16:35:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8266E29C43 for ; Mon, 29 Oct 2018 16:35:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76C4A29C49; Mon, 29 Oct 2018 16:35:48 +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=unavailable 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 09B9829C43 for ; Mon, 29 Oct 2018 16:35:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728098AbeJ3BZH (ORCPT ); Mon, 29 Oct 2018 21:25:07 -0400 Received: from mail-it1-f194.google.com ([209.85.166.194]:51806 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727461AbeJ3BZH (ORCPT ); Mon, 29 Oct 2018 21:25:07 -0400 Received: by mail-it1-f194.google.com with SMTP id y123-v6so4099037itc.1 for ; Mon, 29 Oct 2018 09:35:46 -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=erqJyLDrFzT48L6U/aKmczZYaW0LzlTPA7thN645LBSH2M6IcklBIkxdY2GW8G7NgM dSWdOPbBPF8tuGF/O/mkn4louq+lok2Fxvm1mQIsovv7qek90hPGI9MJZKv5xehWSWP+ KsaKxY3ZWId1+3PZPlbO6xaeaNvp3ABtqdu7pl+ZzJk3RfED+kycoCQp123xPmXknnsa I/Vi00XNcBnTICUz2qFuROEIqQJQgQ4vb8n6hRwrIkBGUUKNHkm40VJwaoiwOZw4Kkkw iVIyCcaZnY1M1OvhgQIb25UnSB4glQA64rYSo0qrjs0SkER6F4Dc4z4b1oLHtnIuytiP H1Bw== 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=dfKJXoNYbtJCuI8THwgs+fmTx05tg2UCbPIL2QtS65f2RLUD6lgwNHM2ZP0pyrTQow 3a65Myru7rDbK1Zm0s5OPuNG7IsuHmmhxFAzO1B3NHD8UiT6rb4vKrtOh6J8QGuipXtK qsxaKxsOXAKQs7A/BQ0EkbiRvRFCDR3s3yYl7OfYO4UqCYcbyKC4Eqi5FxpOo3E8QJs7 r1SmXyieImNUdA319/bJPRKVWcTm/sqrW+V9dof2tYxyh0ImemuXwz+IuTBPLagyPI0p aYmCUSM5amk1BiYaWYIEntcc9aFDnUaKnSWtftFJ9TV/IuIXS0tml8MVRN0vhIhdH3Bd 3SPg== X-Gm-Message-State: AGRZ1gKqKULIAmPYu5S6gsDCYWUsRu9KhdCOVQ6fkxXHDWK8Blnj+ft0 SyhzyONr9a0EwWinPTBJV8UIT68we1s= X-Google-Smtp-Source: AJdET5c8O5t4mkxHvJT+aT8hF1SGEDjqBLOMZjdnxU2suRA+AEjuob0e3hFJ0slMSN6ZBmSzNExfNg== X-Received: by 2002:a24:9717:: with SMTP id k23-v6mr7427854ite.94.1540830945457; Mon, 29 Oct 2018 09:35:45 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id n7-v6sm6464500itb.22.2018.10.29.09.35.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 09:35:44 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Cc: Jens Axboe Subject: [PATCH 28/29] blk-merge: kill dead queue lock held check Date: Mon, 29 Oct 2018 10:34:43 -0600 Message-Id: <20181029163444.9940-29-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181029163444.9940-1-axboe@kernel.dk> References: <20181029163444.9940-1-axboe@kernel.dk> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@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;