Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp437018ybt; Wed, 1 Jul 2020 02:04:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxO1boiAxH6Y0iPEqRFHJHntMILeb24Tac2HOP1vI63/efK1/pj7mJlZ1SMYn0tIH+8oUS X-Received: by 2002:aa7:dd10:: with SMTP id i16mr25632132edv.227.1593594253474; Wed, 01 Jul 2020 02:04:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593594253; cv=none; d=google.com; s=arc-20160816; b=JR+HnNpobcchLxD/El48AXG45ygw+ffMN+NFNj5wsQ/FYYkI/uPiH1eCvZK79CIDOv FpzlwoRF9wlr/maHewZ3xypXEBBhGZbrYXYal5EBriFw8KScHJZIyZBDlXCTe/Xe42QA cyNE/NXEkd0pXMAo2/GbSzLdU6fCh1+5ZzEy3KLVVNSOS6HMBcL5Jx5wWnlhzEWL0hPx D3Kls+srM2MAs1O0auwpYy8T4thGrB3WXQrTmAn/R27jP/6VynayXABPRf6TbOO6bl/r XlwwsNf5yl3Ug7GxkO52cFcKk/6iumttXK10KX9F2reBW3AnelX/zS5iZkuU9dgR5L7Z Ot8g== 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=x/Lapiju/RCIeWIuz3o8sd6pkgFSKFSdWu2H7EUGYIE=; b=VgEGc0ddLLPXXIEAWnklyszWNENXtbgPYFodmPPzse6hubKnR5QHSn6FtFxi7HCdVW kSdT/Ffxlmu2hphj9knBRwGs9JiDJHDCf0u9vhF5yJRnuI4hUmqgTF0E9SygAe5Rgf+L 56gVWehfDMWwbfAbaMrd9gt+E8XC9GjzU2SAO8djZm7gR1h18+JOdAHvuI9tXyHcQAn9 L7zswl+4kYy0134SOUzJmjwbVGT1uEyge6zgVYzoBpNGIdoEB8tEzWRTT5qecCxyO+Ww /CcGEVxJpdcRUXrxNXTrSBJAYsuk+U/kWelKeZqWoAjui2KoyA1WHBhzSQbwqD23vn5Z OfBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=cUbn7Pxl; 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 e17si3418494ejk.740.2020.07.01.02.03.50; Wed, 01 Jul 2020 02:04:13 -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=cUbn7Pxl; 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 S1729436AbgGAJBl (ORCPT + 99 others); Wed, 1 Jul 2020 05:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729080AbgGAI77 (ORCPT ); Wed, 1 Jul 2020 04:59:59 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2919EC03E979; Wed, 1 Jul 2020 01:59:59 -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=x/Lapiju/RCIeWIuz3o8sd6pkgFSKFSdWu2H7EUGYIE=; b=cUbn7Pxl3iVIktS63nJOjTDhdj CfyO1exZuxlh1JTjnZcHfOk9yHVqjEWcViE8zZCbBBD3GXQYi/MTmpBuPjUDMw2Wa4XSvPxrryj3s +6nt9I1whJaM+9EbgTix65yH/OCDuOmII1bxFx0Ld/UtuF3OaOm1ahW7UrzPmD0YIS6pu26Vo9qw+ sQt0dJJFtA9hIqHf4548XR65FQ6n+eFn7Og7Ox2Pi9nK2nV7JLpXxh+QjwclNNOIZAwkU8zAUi1qk KhPBZghQeL9IpqMWdpQXiMIordOsXNOIW5luE/k8g8DuBcRRZebGPUK43sxdftZJI1Woo/J9tAeLJ R/Y4MCfQ==; 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 1jqYay-000882-6q; Wed, 01 Jul 2020 08:59:56 +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 05/20] ps3vram: stop using ->queuedata Date: Wed, 1 Jul 2020 10:59:32 +0200 Message-Id: <20200701085947.3354405-6-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/block/ps3vram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 821d4d8b1d763e..5a1d1d137c7248 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -587,7 +587,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev, static blk_qc_t ps3vram_make_request(struct request_queue *q, struct bio *bio) { - struct ps3_system_bus_device *dev = q->queuedata; + struct ps3_system_bus_device *dev = bio->bi_disk->private_data; struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev); int busy; @@ -745,7 +745,6 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev) } priv->queue = queue; - queue->queuedata = dev; blk_queue_max_segments(queue, BLK_MAX_SEGMENTS); blk_queue_max_segment_size(queue, BLK_MAX_SEGMENT_SIZE); blk_queue_max_hw_sectors(queue, BLK_SAFE_MAX_SECTORS); -- 2.26.2