Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp186993ybj; Fri, 8 May 2020 09:21:02 -0700 (PDT) X-Google-Smtp-Source: APiQypIp2mWDxVpeFG0MzkgSDZcewtfpSrxyPv7TK6u1onsTEfnk8eVOWADPisU8Ao0WwJiUrSoW X-Received: by 2002:a05:6402:1008:: with SMTP id c8mr2680520edu.242.1588954862338; Fri, 08 May 2020 09:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588954862; cv=none; d=google.com; s=arc-20160816; b=y1FnUrm+nmnL29Bzm/21tTiq0qyg9V2TD3wQbvYI0Q14SJnML7WVNagNfWxC7e9con EOlbKtZ8p3Jbu/g2yBAeeRVZzYtSOr3vgiCZmIm/3o/Phj1sUzQN64qhFh0MpFidIwRI 2xeCAFFz5JVXgkryOE9tdjGrJfM/h6bn2FIhqfxVY4bqizY6i3PNKK9Ms1XBHN9ZV5Ai X0s9V3CAGVvaMpMVAHlPL//+4HKigJWsfyTR7T5YzJK4zqijF3UrM87guTA8txLavd/g E+vEQClrwrX/bYJmb+DbRXPtoEgFDylYcd5UDlynuesuvg5/KzR2bemVGNz2bjCp82Gc UNLw== 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=j5nrzAlvNQFEC2KON7qkpQkXIXdfboSiMBR3IvqeqYg=; b=KFsRenrSQyHJ6gr1bXE3pgopf/eTXk591o60jnZYsaavTXSGS+fTtv++AnwCquVO6D bFtXxsPILbZ2CBkgSsXCGat9FiJQLtkjgX0QTBZoFMsbs6DPw/kIhU2keseZ7D6VeS89 bBdCfvtk2sacOVN3by1j7t0nzqlZwOzoOuqpTzdTGDUo6s+IAjxJNp6oagP3xljw+rdP E9tOocfp7KD5w8AbIgfLZpwVvK6hSBNz1LUqWPbeWeZmrXmh4zbGEohK6Rh6jMYNvwGJ CM0KLWIZFz6A+d11Bo6GG6qFaLe1673VVJSnbOc+R0M73t6c1oC/tOALXqNbi7rx4WlE aw+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=MZaYZgws; 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 v24si1202348eja.257.2020.05.08.09.20.38; Fri, 08 May 2020 09:21:02 -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=MZaYZgws; 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 S1728636AbgEHQQl (ORCPT + 99 others); Fri, 8 May 2020 12:16:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728485AbgEHQP6 (ORCPT ); Fri, 8 May 2020 12:15:58 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 895F5C061A0C; Fri, 8 May 2020 09:15:58 -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=j5nrzAlvNQFEC2KON7qkpQkXIXdfboSiMBR3IvqeqYg=; b=MZaYZgws8RyRNk7JmFkevJM5QG XkP/5QQ+KcB03US1KdXYdVY4JWMd45+cQiqhbpJ2aisOmBp9lOOd4kfjkyTkjQwbZkkZrq450qSNz 0y+mklGTu6scOtDYJLkdl7wTCN9XMTxpbIQBHXEJpAvwuhpuK2AAll78bcBvs+NRHP1WHn24osKJD +hBLRYfPBBwcRMGtWvC/ZB/eiukX+tAZRYobW/Vc17N2qUlFsAfCNtu1m53RPB6+kmGJVLmIZUBJa rOfp4vdPLFhYMyKQ5cFw70aiKXFCl3jZXbIboLehfTk7XajvhEJiY/3q4vycGCJ2WbOoWFzQnh9zZ x80RGkzQ==; 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 1jX5fG-0004lz-8s; Fri, 08 May 2020 16:15:54 +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 11/15] dm: stop using ->queuedata Date: Fri, 8 May 2020 18:15:13 +0200 Message-Id: <20200508161517.252308-12-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/dm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 0eb93da44ea2a..2aaae6c1ed312 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1783,7 +1783,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; @@ -1980,7 +1980,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