From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ACCEC64E75 for ; Thu, 26 Nov 2020 13:32:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 104E721D1A for ; Thu, 26 Nov 2020 13:32:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Ps46omJJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 104E721D1A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B9EE26B0085; Thu, 26 Nov 2020 08:32:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AD9136B0087; Thu, 26 Nov 2020 08:32:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 907196B0088; Thu, 26 Nov 2020 08:32:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id 6329E6B0085 for ; Thu, 26 Nov 2020 08:32:08 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2D59D180AD801 for ; Thu, 26 Nov 2020 13:32:08 +0000 (UTC) X-FDA: 77526657936.13.key34_12052412737f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 089D518140B70 for ; Thu, 26 Nov 2020 13:32:08 +0000 (UTC) X-HE-Tag: key34_12052412737f X-Filterd-Recvd-Size: 4788 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Nov 2020 13:32:07 +0000 (UTC) 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=iazboObhpRQdXc4RZ3Z2xK5xBt9YYa2ViLJzmnoL+94=; b=Ps46omJJtF22CamxjjwC6dUdRb xQI6S5cYvUoOUo66OCOAghh7MfxTKAjOflxIy05K2Lo4XpZxkXe8AqXAwrZYq8syv7GPule4CTa55 hxqPQs17t63UtRYI79VnS8uysK/1mH8NfQmbNBEueb25mxmALpgmPpsCAAFymLc7Ev6Glt9v1Gt97 VuFcGw3NXCtZrdmecHp2i9RnW7Ng5+oQI7sEXPLUXYMSmk4O5vP90EXX1ULOy45g/RusLso9BYTv9 i79QGkZ33g8nfIBzUpCNv9JEtuRf9ViNdkbKqkLykiKXIz2IISS71BNU1W7GK+aPfPTqDbwdfNa1P aaiqFDpA==; Received: from [2001:4bb8:18c:1dd6:27b8:b8a1:c13e:ceb1] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiGzi-0004AA-8h; Thu, 26 Nov 2020 13:07:30 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 39/44] block: pass a block_device to blk_alloc_devt Date: Thu, 26 Nov 2020 14:04:17 +0100 Message-Id: <20201126130422.92945-40-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126130422.92945-1-hch@lst.de> References: <20201126130422.92945-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Pass the block_device actually needed instead of the hd_struct. Signed-off-by: Christoph Hellwig --- block/blk.h | 2 +- block/genhd.c | 14 +++++++------- block/partitions/core.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/block/blk.h b/block/blk.h index d5bf8f3a078186..9657c6da7c770c 100644 --- a/block/blk.h +++ b/block/blk.h @@ -350,7 +350,7 @@ static inline void blk_queue_free_zone_bitmaps(struct= request_queue *q) {} =20 struct block_device *disk_map_sector_rcu(struct gendisk *disk, sector_t = sector); =20 -int blk_alloc_devt(struct hd_struct *part, dev_t *devt); +int blk_alloc_devt(struct block_device *part, dev_t *devt); void blk_free_devt(dev_t devt); char *disk_name(struct gendisk *hd, int partno, char *buf); #define ADDPART_FLAG_NONE 0 diff --git a/block/genhd.c b/block/genhd.c index a85ffd7385718d..89cd0ba8e3b84a 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -559,8 +559,8 @@ static int blk_mangle_minor(int minor) } =20 /** - * blk_alloc_devt - allocate a dev_t for a partition - * @part: partition to allocate dev_t for + * blk_alloc_devt - allocate a dev_t for a block device + * @bdev: block device to allocate dev_t for * @devt: out parameter for resulting dev_t * * Allocate a dev_t for block device. @@ -572,14 +572,14 @@ static int blk_mangle_minor(int minor) * CONTEXT: * Might sleep. */ -int blk_alloc_devt(struct hd_struct *part, dev_t *devt) +int blk_alloc_devt(struct block_device *bdev, dev_t *devt) { - struct gendisk *disk =3D part_to_disk(part); + struct gendisk *disk =3D bdev->bd_disk; int idx; =20 /* in consecutive minor range? */ - if (part->bdev->bd_partno < disk->minors) { - *devt =3D MKDEV(disk->major, disk->first_minor + part->bdev->bd_partno= ); + if (bdev->bd_partno < disk->minors) { + *devt =3D MKDEV(disk->major, disk->first_minor + bdev->bd_partno); return 0; } =20 @@ -735,7 +735,7 @@ static void __device_add_disk(struct device *parent, = struct gendisk *disk, =20 disk->flags |=3D GENHD_FL_UP; =20 - retval =3D blk_alloc_devt(disk->part0->bd_part, &devt); + retval =3D blk_alloc_devt(disk->part0, &devt); if (retval) { WARN_ON(1); return; diff --git a/block/partitions/core.c b/block/partitions/core.c index ecc3228a086956..4f823c4c733518 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -392,7 +392,7 @@ static struct hd_struct *add_partition(struct gendisk= *disk, int partno, pdev->type =3D &part_type; pdev->parent =3D ddev; =20 - err =3D blk_alloc_devt(p, &devt); + err =3D blk_alloc_devt(bdev, &devt); if (err) goto out_bdput; pdev->devt =3D devt; --=20 2.29.2