Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp185922ybj; Fri, 8 May 2020 09:19:26 -0700 (PDT) X-Google-Smtp-Source: APiQypJWBaKVbFvnfKFnv2gHpb8SiX0kqAUbRyrikmCNx395BxJ1GILKDlPtz13gnh6Rbdi3G2R4 X-Received: by 2002:a05:6402:1b0b:: with SMTP id by11mr2763724edb.269.1588954766661; Fri, 08 May 2020 09:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588954766; cv=none; d=google.com; s=arc-20160816; b=fZ829X3fGecjYIcyNGSCuK26C+9Oq45JsVWjXzaVn25fce0kI1W23+0Fy/J20rPowb 0eXvcjn5kee+4QxjhW1EQKmsBiskkTV8ecCn1K+1tm2ptD2+z5v/pgz+9jGownlIL31n bib9O40NolnqTtao8e5TwMyWxZZQSNWV6FkPWTSlNwC6uqgEd8WYkTbXOczfhttSRC+v Ysc+ScBmdIyPiWX3BQzl7M6TGeuvmJs9XszFQU8t9O9RnJ2nAym0BSMUNvT+8UXptGiu 6vkC7pVeV8QnzjXSPLBeZjCMQ1bHn3a9I9keMVh+iTHH9hOneDsFoJmtX9wRqyTTc+Dv jNQA== 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=HlFUrIsXXrT3FGrj+t+2DKf1Ayrd2rUUKJZx0tnooCU=; b=013pQ45rWp7JUR4sM/P0+uA6jENYXb2xG91B0csC/l4+xi+2yeCxltMhVH01fa/LUY +REBGe8vOrrnWwaZwY8Gi16itsPLTrQ3YVUb0C/ArSBYL5/p2O88JFodyapfoOsdDt1w o3AMJqO8TAXzEcMyrMpUTglVg6avuq7tRw4ADaZHVMBXxsDzgLfgAM0t4/x1IYnbRrrL CzKfp54emwTiiegb+n08sDdwVlh6PgZfeX/UApk34PnCL+iB+QaKxVkZFrLgTYWRuu0J /Lw8d9NsGKA/n7nsAzCQ5PPorGBW3bk7auLwd0p58NuwJY3KsRvnpqAPNL9GL1Q62wAa FJwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=EQcZ9lcq; 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 cw22si1193288edb.418.2020.05.08.09.19.03; Fri, 08 May 2020 09:19:26 -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=EQcZ9lcq; 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 S1728380AbgEHQPp (ORCPT + 99 others); Fri, 8 May 2020 12:15:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728303AbgEHQPm (ORCPT ); Fri, 8 May 2020 12:15:42 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20E5AC05BD43; Fri, 8 May 2020 09:15:42 -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=HlFUrIsXXrT3FGrj+t+2DKf1Ayrd2rUUKJZx0tnooCU=; b=EQcZ9lcqIhWgf/a/iJ5DwA6Sha gf5uSVNmMUlw/jcl7YXUEXqIvr35+7/BPF/sSeZgUIasRrdGT3lJKB2He50QRRCKRH1dLZmua8m6U 8QtgqejzYZhRdvlnGTbjG43/Hdnmr/yTsWBMA+jTTsVn4N24woLZ6Vc2MiSoaJ6sHFGYy75Q9VGfN agxyJrMo1YhMzpkn3R/wcC/3D+Pp4oswvBfwzZcGpq5Lolc/Gj3m19SLY3qHxMmkDg9TLYsrGfJkl vvKoXFnApy0vHbmezAu7Iygy0vujNJDawqRbRhk+sJ6Cjd9r0hMZsACikt79mNY0/96JbqiHoHGTh wQoQLnog==; 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 1jX5ex-0004dV-CD; Fri, 08 May 2020 16:15:36 +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 05/15] ps3vram: stop using ->queuedata Date: Fri, 8 May 2020 18:15:07 +0200 Message-Id: <20200508161517.252308-6-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/block/ps3vram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 821d4d8b1d763..5a1d1d137c724 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