Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp184770ybj; Fri, 8 May 2020 09:18:02 -0700 (PDT) X-Google-Smtp-Source: APiQypJ7VttyUSOfDVgDAkO3JFb+XQXuf7JQpAYgPQKinJEcTq/XLYrCaO3EIh3LlfWp+ovVLrNT X-Received: by 2002:a17:906:2b96:: with SMTP id m22mr2492653ejg.330.1588954681944; Fri, 08 May 2020 09:18:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588954681; cv=none; d=google.com; s=arc-20160816; b=orG3X6tsKz0VvqtcfIsGrd7e3fxhmIgCokT11MJWIDlLtOBZNwSo9Wu/yWyt4+KHey LiGY/vKoV3taS5kkUMTV19K0eeFoYQKPlKoHX6qvauflM6YtOTxn0XNc8SU6hipWRO9L n/DEk4cmEDVpZ4Jh4tFIwNe8ZXQpbUio2QvhWhanGyeE26N0DQV2fxZ+y7BHhKYCENfc qHYJDvU6IadGzECo86NLcKEZBvrSx+QInSNuAKiZINWB4qhV/c/lBcBa2Xq+/4h7Iffg qnmK4Z+Y/AXHoqw2//9kqjvLrl+n7ix18Zs66+mz0y6PHJtXmYPy7nBFosFjsmkX0lVM frZg== 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=StWP0crF+8pSNFux4pjsqh9CnHUPvltK4WN7YgDzDwo=; b=Bascl7kcnxbvOa7Ur3rRFeZYUYlEmbJRgn9/YK4O5GzNkdxDccYeFKyk8qBxLNeaHE ty+6O0PPiJQMUioAVyxSdLo2GrGGJ9XIo6kNxTpQMXfox1c6rn02ox/JDpQ4+9u2PTTH ufDfC/VqqthMgSxCClKJ6SrCePIdKnK+PLLefVh0ykd+NzyMvmbfw6gFgXZR+n8l7BNd DLjU5Ww50un/fwZZx/4k0AVrJD/VOaNwOXMlbYarczW4RJB4LfhPhbn4qXUVWl0VeG+b ngawErcdYIxKm8gvKzRqsGELLFzehBPEw7FWy9pGh4iNO3LqrBy1Nm5drtVPvxgPO6Dd 6XrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=hg0J6vPc; 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 rn23si1297922ejb.331.2020.05.08.09.17.38; Fri, 08 May 2020 09:18:01 -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=hg0J6vPc; 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 S1728415AbgEHQPs (ORCPT + 99 others); Fri, 8 May 2020 12:15:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728333AbgEHQPh (ORCPT ); Fri, 8 May 2020 12:15:37 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEDC4C05BD43; Fri, 8 May 2020 09:15:36 -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=StWP0crF+8pSNFux4pjsqh9CnHUPvltK4WN7YgDzDwo=; b=hg0J6vPc1CAtRbBcIKiIwGZj1R U/NYXsltRCgUXRtF02xAh6x/dQQt7bD8PzPhXtSQ7xtfClVpUVDRELn7ixFyZ4B2pCgOFCooBv00b Kb3UuE2iupMli5UVx0Ld3aKZ1QZcPq28l06UGMLW5DFIhlEjEpmVKcxKOP5Z6+5Ul64aYiy4wQLjf XUU256tNa+A9CfSiuzAX8CUPPPYrqDPrd5en8kVJ2NLMaRiEdIyuo4wfyA6bowpdUqeN6bgwNuwZy ZWQbvwwkYO4D0ebTcT0ciGUghRQlVk/s8oLF8DDRZGiij+odbfRZdhIEZqowwh8vFKNKZjPynC6hV xkR17kBw==; 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 1jX5er-0004Wm-9C; Fri, 08 May 2020 16:15:30 +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 03/15] drbd: stop using ->queuedata Date: Fri, 8 May 2020 18:15:05 +0200 Message-Id: <20200508161517.252308-4-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/drbd/drbd_main.c | 1 - drivers/block/drbd/drbd_req.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index c094c3c2c5d4d..be787b268f044 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2805,7 +2805,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig if (!q) goto out_no_q; device->rq_queue = q; - q->queuedata = device; disk = alloc_disk(1); if (!disk) diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 840c3aef3c5c9..02c104a0c45e0 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -1614,7 +1614,7 @@ void do_submit(struct work_struct *ws) blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio) { - struct drbd_device *device = (struct drbd_device *) q->queuedata; + struct drbd_device *device = bio->bi_disk->private_data; unsigned long start_jif; blk_queue_split(q, &bio); -- 2.26.2