Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp437142ybt; Wed, 1 Jul 2020 02:04:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSip9Dw9NgNkjiMp35XTPfpLO130KynfMmjWyurwCRfBl1efO/OCYxoienp+K9t2g+Gerr X-Received: by 2002:a17:906:2786:: with SMTP id j6mr21562881ejc.216.1593594262780; Wed, 01 Jul 2020 02:04:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593594262; cv=none; d=google.com; s=arc-20160816; b=rlAWIyJq5X83Pdcnd5x78e3x6G+0mcpdbY/eVmFuQtazV5MO6skUryLtAAW99uE6Pt CbcApOrnY8zLxiaGYHgHAtq145qVsKEmd7cvlCZ8KifAAAzgwMb0EvfPFItiMxzY/E/r lFyEaSP2lKcP9D01/itoJMYx87n8/sd//2EX0CKoWtN9YXP/qXKKxsB1lfCMJhhJlRxY WWsl2k25OsJyv4lDXyZRdZDGVjpprJZlVogw7TrjMT+y7XVL87px0s/HVXR5Kk2xXhGd VdQwDpLUMSw9x1wdnhm2R+OpzVo/sjxE9RSEbDbBDcR4vpB2eMtwDn0tL/dC92rbFG4R aJOg== 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=KKN2Rzx949H+NoG0kbydbtU4p/7MhBgkwEQu/fGRZVo=; b=FxLmsS3DGV0NUEg/cqO+WC+hkJKL1qBnLIHp33Sayd+LYSjjhqO6O/q7M0f8TpVw6b d5veYR9SDhfv7XLDnKh0CxFiUhqioXCnK4/q+n+e1+1/8XJKZi27TF5N6YwxhniABWjd ll3NFY+hBKMYYAdcyzdZDAQB5/gzNpLaQhDJi86C2+tzH1u17op5NiK/bHlQ9WZs/A+H AUkpcKtf2BKcMfO3BSTHLHSq0p8eOtGVjSgarq5Teg96cLLa/GzJdAWhdxliReN2qNF9 FKim4441NybnLQHZ00dq1AiOUys23G6obkcNCyWP8ZFrF5d80DcnpX2UwsxjPl8s/FpY jDwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=IXEOhZUY; 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 qo28si3516559ejb.527.2020.07.01.02.03.59; Wed, 01 Jul 2020 02:04:22 -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=casper.20170209 header.b=IXEOhZUY; 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 S1729381AbgGAJBQ (ORCPT + 99 others); Wed, 1 Jul 2020 05:01:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729158AbgGAJAH (ORCPT ); Wed, 1 Jul 2020 05:00:07 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C14B9C061755; Wed, 1 Jul 2020 02:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=KKN2Rzx949H+NoG0kbydbtU4p/7MhBgkwEQu/fGRZVo=; b=IXEOhZUYnQNNzu3t9mdfIy8WvY DVEKFQZET7Rij1211SD+rN05JspdCg15L9ZU6/zu7LxxnnhTJikfz7M1sJIG8xQA0xcu0rO6KOLkb pAwzjGPZ5OMd8TtwrqIQDxg6YkuwDQzyqoSNr0tCHSOb4F1kRKGGsFlGiuFFAo1r/b3LbJBZmAZVu 6trBluSgqUBQbxJnNSWeQ0yd34j2v4iAe5/SECmBmDF/OR9mu/RezGXQwj1QExXbaYQvu/P37eAOq cXfzABCIpIGkJ+9JXWCdhyzKfyzomUaRkeTwBL+vMOKjF8SP8927x9+HrlnQNtmqsIgjy8MWEEE89 w+1ZOK5g==; Received: from [2001:4bb8:184:76e3:ea38:596b:3e9e:422a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqYb5-0008Ap-A7; Wed, 01 Jul 2020 09:00:03 +0000 From: Christoph Hellwig To: Jens Axboe Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org, drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-nvme@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 10/20] dm: stop using ->queuedata Date: Wed, 1 Jul 2020 10:59:37 +0200 Message-Id: <20200701085947.3354405-11-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701085947.3354405-1-hch@lst.de> References: <20200701085947.3354405-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.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 Instead of setting up the queuedata as well just use one private data field. Signed-off-by: Christoph Hellwig --- drivers/md/dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index e44473fe0f4873..c8d91f271c272e 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1789,7 +1789,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md, static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio) { - struct mapped_device *md = q->queuedata; + struct mapped_device *md = bio->bi_disk->private_data; blk_qc_t ret = BLK_QC_T_NONE; int srcu_idx; struct dm_table *map; @@ -1995,7 +1995,6 @@ static struct mapped_device *alloc_dev(int minor) md->queue = blk_alloc_queue(dm_make_request, numa_node_id); if (!md->queue) goto bad; - md->queue->queuedata = md; md->disk = alloc_disk_node(1, md->numa_node_id); if (!md->disk) -- 2.26.2