Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp186698ybj; Fri, 8 May 2020 09:20:34 -0700 (PDT) X-Google-Smtp-Source: APiQypI0dgYZjUe2PBZ+Ppx3l/AqiiJ0yV0Y7YEaMI/rpAWbZ1dYF8cOKk+kkJu2oDzZOyOV3GQ/ X-Received: by 2002:a17:906:b250:: with SMTP id ce16mr2434299ejb.216.1588954834369; Fri, 08 May 2020 09:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588954834; cv=none; d=google.com; s=arc-20160816; b=mXS9QfwMpXR/mNhNvizdkm/r/3VfI5Ws6F9WHTJ/Bnf3Akk48xwbfA2D458F9714dT tENEkpGcP1hanr3hUT70PG7v6LMunKsq7g4tvosI6Kwn/da3A1GOaiOY4FBIRjPzxYl6 eQuli/JTwbYiyw80EZ56rD63Mr07onYsp8qWBjVPp0xT7pnFopv6uiK910K3e6CiIhRA 1ToH5a1ydaidgQaoKPfZcncg2wB6asyMB0q//YIQR2fk86dgd7Yjm2F8Jd2zQ1mBCH1E KFK6uOuubUS3vRhMsaM+ieReksWm34sOqscJIAPn0TZRzCVnF9IEdecKAOEVG5avECOp hSNQ== 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=xqUmHHy02koBEfSFWiUuHH2Y6nKAt/nZw4u/FVTv6zk=; b=OnPEaIPkQZWe+xSCQm+7CIbcX20eFvqZkAnz3sAKd7hT4cetp9H1lz9wy5uOC1UuGY 7YC45ROmc5RjmYxCIjxdLUnIuZgTzHu7rL6J08+2+D7NbIlBU4hSPvuSCsvCMHIn4iQI O2DoAnK4kWmIX04W5GoIhdDKtnZp7Mst9GKLJ34hRE/2Bzw9H87A+dVzOAnkk7f8BQ/1 GOn/S/PP6ixv9LqzjagMndp8R0Q9gL1DSz0aKU3b0Oc24IvtVmQObPxZm5FasXulCQHe Q2D4lP28rT0aEP3js3Z212ZQUPqRCKhRs4MBTcqpufgmANh5HMLjHBWcnw7opTM0Gr2p mWWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=BxJHu15I; 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 4si1328075ejy.347.2020.05.08.09.20.10; Fri, 08 May 2020 09:20:34 -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=BxJHu15I; 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 S1728588AbgEHQQP (ORCPT + 99 others); Fri, 8 May 2020 12:16:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728544AbgEHQQI (ORCPT ); Fri, 8 May 2020 12:16:08 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F870C061A0C; Fri, 8 May 2020 09:16:08 -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=xqUmHHy02koBEfSFWiUuHH2Y6nKAt/nZw4u/FVTv6zk=; b=BxJHu15IRW004JkxZY/KyYHUej 74WLt+f/xjeWE/ehYrxDrBGRkkA//dnglHTvVOgtDoQzzOQKY1dyKm9LHMP9Eb4fGadhIpgkIojYI eUfKgVHrl9kbrdlcLpUqFRRrfnuJtQpdCIZOhmcoS+uShMnTu3r0x49dNbVwuLCKdArfz18AzF3RP cMF64rqnSdOmJClYev0alieJ13GC0i+TG8Fll/eotlYw7azmblEgoldOFuS3A1QUypcphrVGe4QCM Pu8SNC///ni4n5Z91Bl8/8JHT/Tow1csQjCnGXVp4YKgmxEo6KAjYrayvew3Qyg7WLowVbYI96tnF 5JHSr8DA==; 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 1jX5fP-0004p9-Aa; Fri, 08 May 2020 16:16:03 +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 14/15] nvdimm/btt: stop using ->queuedata Date: Fri, 8 May 2020 18:15:16 +0200 Message-Id: <20200508161517.252308-15-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/nvdimm/btt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c index 3b09419218d6f..eca3e48fefda1 100644 --- a/drivers/nvdimm/btt.c +++ b/drivers/nvdimm/btt.c @@ -1442,7 +1442,7 @@ static int btt_do_bvec(struct btt *btt, struct bio_integrity_payload *bip, static blk_qc_t btt_make_request(struct request_queue *q, struct bio *bio) { struct bio_integrity_payload *bip = bio_integrity(bio); - struct btt *btt = q->queuedata; + struct btt *btt = bio->bi_disk->private_data; struct bvec_iter iter; unsigned long start; struct bio_vec bvec; @@ -1543,7 +1543,6 @@ static int btt_blk_init(struct btt *btt) blk_queue_logical_block_size(btt->btt_queue, btt->sector_size); blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX); blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue); - btt->btt_queue->queuedata = btt; if (btt_meta_size(btt)) { int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt)); -- 2.26.2