Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp185384ybj; Fri, 8 May 2020 09:18:50 -0700 (PDT) X-Google-Smtp-Source: APiQypIhAoXcoxh9E7bx5KDz7ButPJcGsJOAJK/fJnruzKGGlkGnaoKGSsOd9g2rPmXw8+MjOS6h X-Received: by 2002:a17:906:148d:: with SMTP id x13mr2485130ejc.152.1588954730556; Fri, 08 May 2020 09:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588954730; cv=none; d=google.com; s=arc-20160816; b=znzk+G2qX7GC/VpzwHyO3+EcBoRACA1trXmF3TtHGP5vQxbO6MrnZAMvA98E7RJ9GW THwAn+6TdOWIsRdm9B2+QJcTg9JydpN/6K0BakLVJT2YMYM+qwCfLN+9AyZPKwA7uxfx gJVsaKjSWT/FckDQedErwvQr7KeSGlE6cUGxiHXiWUVUYTStdPMTHXnvEIJsjKVdiW2x c3G+8p13NAeyEwKeruMT+bOW8GGJY7Fqk555z53e59UFyRO/bxe4IsPvixGpY5WiiI+C mx2FC9yTpD4+oVruyFGJN4GuHKIunfeYC6WKjpuuK42aXpgP6oC4pIOyuyfe18SKKqF2 sXVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=reoioN+SzUTCBcbV1XFXAraZxNdP1dP6cCeZt13G6tA=; b=mIK5mmmTrfe/3DB4PMiX83GXNwo+qdYQ7/Brazv4Mh/sXc+OHHEkr2Pf8FN0dDjctz E0grXOKryUUA6K/wwJauziOKPIgZUAqPYiSZGGC5GC9P0PgCMdLD/20v4klSAknuVZrt 88iXXKBFJOn1wvHOyXC7h4+vtzsM5gpW6QSZjU/AYNNjmS9GNQCjZW/woQsD/E5waXRV zVRre+7Zd2wlOaq3KS2gz7TZI+gv1kLdZv8spk8C4x8sIv8GlmWNYe46XPVQbzYTpe/w KeNLg1AWVTWB8foDUq501wWe9n1SMwnyFZYIhj9FKc+IauUHEwpetfe6UCsVLjxZtXRt 3Trg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=fK2aBIt0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a6si1110988ejx.373.2020.05.08.09.18.28; Fri, 08 May 2020 09:18:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=fK2aBIt0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728549AbgEHQQK (ORCPT + 99 others); Fri, 8 May 2020 12:16:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728501AbgEHQQC (ORCPT ); Fri, 8 May 2020 12:16:02 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02175C061A0C; Fri, 8 May 2020 09:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=reoioN+SzUTCBcbV1XFXAraZxNdP1dP6cCeZt13G6tA=; b=fK2aBIt0vzlaWJtBvexdAvJMAe S6cYDoV3UE72OWzzPYY4edNpTfoOTq7IOZGfcsghCdgzVFGyK0VVaSUDHuAlolBqdDM4GeAktdy5p bu9ycf3ZbUnayKti5+mUhsIpbtX7ZBNtsu4urRUK3quNTS59x8GSvPOos6l115fjOKLGtS2IXMfeg nOY4PMbqzyodo8tx0Pwr/3ViI5fQ9jWmIYNPMIaHCNMLcBLeNywPpwUc+3nHx4Htb5rL5g99NAouU lhjL0sTDMnJP5/r3qy8gYL8e8SMtdvgE8S2GdEPFK/RtT/8JZxdKTgVOabQ4uZ6GSFIOTjZK90dkg YgZr48QA==; Received: from [2001:4bb8:180:9d3f:90d7:9df8:7cd:3504] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jX5fJ-0004mp-7m; Fri, 08 May 2020 16:15:57 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Jim Paris , Geoff Levand , Joshua Morris , Philip Kelleher , Minchan Kim , Nitin Gupta , Sergey Senozhatsky , linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, linux-xtensa@linux-xtensa.org, drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org Subject: [PATCH 12/15] md: stop using ->queuedata Date: Fri, 8 May 2020 18:15:14 +0200 Message-Id: <20200508161517.252308-13-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508161517.252308-1-hch@lst.de> References: <20200508161517.252308-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- drivers/md/md.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 271e8a5873549..c079ecf77c564 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -466,7 +466,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio) { const int rw = bio_data_dir(bio); const int sgrp = op_stat_group(bio_op(bio)); - struct mddev *mddev = q->queuedata; + struct mddev *mddev = bio->bi_disk->private_data; unsigned int sectors; if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) { @@ -5626,7 +5626,6 @@ static int md_alloc(dev_t dev, char *name) mddev->queue = blk_alloc_queue(md_make_request, NUMA_NO_NODE); if (!mddev->queue) goto abort; - mddev->queue->queuedata = mddev; blk_set_stacking_limits(&mddev->queue->limits); -- 2.26.2