From patchwork Thu Oct 25 21:10:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 10656589 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 4172815A7 for ; Thu, 25 Oct 2018 21:11:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35C8A2C648 for ; Thu, 25 Oct 2018 21:11:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A2CC2C650; Thu, 25 Oct 2018 21:11:43 +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 CAA382C648 for ; Thu, 25 Oct 2018 21:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727606AbeJZFqA (ORCPT ); Fri, 26 Oct 2018 01:46:00 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:34959 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727593AbeJZFqA (ORCPT ); Fri, 26 Oct 2018 01:46:00 -0400 Received: by mail-io1-f68.google.com with SMTP id 79-v6so6414867iou.2 for ; Thu, 25 Oct 2018 14:11:41 -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=Wa7HzPfj28/JnR7vsummemVHFt2jttGBHCBwDdw7cY8=; b=kR7TXwsLs/DuToW7Z2+SGNkL9zwur8f24Sr0gI6/BhvDTc8jfx//mApVrnENPfWGUI fI0Y9s/NJLugfqrbkxZVxMBgYQIAQyZtJisK5RZj4UUmQITFisij5Np8Mb9oF9B2tSsC ELzrjWaNMMeCLvYsnSzT0Hw3l8uZ9aID8KBoIUZYEMTNa4ZGl9dC4TjNH6RJ9s/oIW91 ISa4SCQbuU54ZbIIBxyktXTBTO6lYw2NTsxk4p7VCUDhO8/+IJF5gjh4Zc+FWxv/F+ei 3QwkzNTrkQy5KSL48zYrGnYw1lyGjcwbTE0+5HHDPgQtxJWp8sYizGcSVcccFPhcEMKP 2QPg== 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=Wa7HzPfj28/JnR7vsummemVHFt2jttGBHCBwDdw7cY8=; b=WmICMwa6vxVno09XN+ZvU89Fh9Z+JCYE4lXSRdJ4LQyxeXyXYUvfmvX+qsjTzvmugo VG/dwkZmENA3dXx6Sbh7j/CkN4HVC0egAPPJk7psBrdW8ZTJRZGBx/v4OtL8uzseh48u xYLuMLA5q4fxOX4pkfUDVBpqDi2XTYMrPavSHAGK1zV9OEsDkIoKQLTTKsGwQF3Vh0Pt hz+biSXfD7NlK7HF8SzCu6+21PIb2D/rLeaml0up8QhBauvtAqq9mrSO0mGei180Hwnc S7SjgXydMIAHKbvH66JqzAMCD3gAJ5fe4YUR9VrbledlcMnE2B4R95k8NrsUYWlV9tSL /reQ== X-Gm-Message-State: AGRZ1gKUvlR+dSfFRlaDOoZFFKUJDKqjTlY0QxCtM8hlLPAIXX/sWO/m auraZVX94yqBNFKq/vsLkvxhDg== X-Google-Smtp-Source: AJdET5cGElTEGYy8cj6QCpZNG9mrFVzNAKIcCHZ02vLaBjA6vJZF8LyH1Tk5+ZqmFDNNirP7zp8D4g== X-Received: by 2002:a5e:a90e:: with SMTP id c14-v6mr517527iod.127.1540501901284; Thu, 25 Oct 2018 14:11:41 -0700 (PDT) Received: from localhost.localdomain ([216.160.245.98]) by smtp.gmail.com with ESMTPSA id e65-v6sm3446375ioa.76.2018.10.25.14.11.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 14:11:40 -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 27/28] blk-merge: kill dead queue lock held check Date: Thu, 25 Oct 2018 15:10:38 -0600 Message-Id: <20181025211039.11559-28-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025211039.11559-1-axboe@kernel.dk> References: <20181025211039.11559-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. Signed-off-by: Jens Axboe Reviewed-by: Hannes Reinecke --- 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;