Message ID | 20181029163444.9940-29-axboe@kernel.dk |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show
Return-Path: <linux-ide-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ide-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="erqJyLDr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42kKwM5tPhz9s89 for <incoming@patchwork.ozlabs.org>; Tue, 30 Oct 2018 03:35:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727805AbeJ3BZG (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 29 Oct 2018 21:25:06 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:54495 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728099AbeJ3BZG (ORCPT <rfc822; linux-ide@vger.kernel.org>); Mon, 29 Oct 2018 21:25:06 -0400 Received: by mail-it1-f196.google.com with SMTP id d6so4708324itl.4 for <linux-ide@vger.kernel.org>; Mon, 29 Oct 2018 09:35:45 -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=Xyo8xoGFUPa6NO2xpDwbn7E8YP964qsxuoPbgkipOD0d8t18QTGSefu1OSnQfx7O5b WiocCWnfFrSrzHt++UdG6eoj+6n3yUrfqGMz+PRCKjDoIxmOUPgIUDJN09DclxbKhm29 HQjfw/OgqXzb3nuhECvfgfy9YXwQGwDN/PDSogoChTrou5iLOxpJ0XVnPS4Ct4Wi9krX 1HYA6tf6zLvUmpHwxsQTvYmrbr2Xk8LEDCxL+weWjs0nScw01eKFkn5iUURefULrj+2n PPeoCeNnQXxtc9B00QpgpGKKKowyOr+WVm3eqa3HyfjLs2Tq/ZHoCL9W9xsU8xLNcOGn HRXw== X-Gm-Message-State: AGRZ1gKpzgh8UFeXOZ3rmtsj51JC6MWKwZeOz+7g0EQjJOoV6on6CREE t9QHbex5UKduSpYqEkJxqojkC1uVn/s= 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 <axboe@kernel.dk> To: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Cc: Jens Axboe <axboe@kernel.dk> 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-ide-owner@vger.kernel.org Precedence: bulk List-ID: <linux-ide.vger.kernel.org> X-Mailing-List: linux-ide@vger.kernel.org |
Series |
blk-mq driver conversions and legacy path removal
|
expand
|
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;