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 A8FA9C64E7D for ; Sat, 28 Nov 2020 16:16:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4A5C82224D for ; Sat, 28 Nov 2020 16:16:32 +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="vsx0WZEw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A5C82224D 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 E64DE8D0021; Sat, 28 Nov 2020 11:16:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D4E898D0017; Sat, 28 Nov 2020 11:16:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8C958D0022; Sat, 28 Nov 2020 11:16:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0099.hostedemail.com [216.40.44.99]) by kanga.kvack.org (Postfix) with ESMTP id 8BAA08D0017 for ; Sat, 28 Nov 2020 11:16:10 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 57530181AEF21 for ; Sat, 28 Nov 2020 16:16:10 +0000 (UTC) X-FDA: 77534328900.11.fifth58_220198527392 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 339AD180F8B80 for ; Sat, 28 Nov 2020 16:16:10 +0000 (UTC) X-HE-Tag: fifth58_220198527392 X-Filterd-Recvd-Size: 7579 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 16:16:09 +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=K01xNfFHzht/rq8NSn+Zw6AHoRB4qp/pQaqe4QHP8t0=; b=vsx0WZEws8MFM4xfSdb6fsjPw/ P05zNRSsVMutf1+uzU2JmG1CUKxhZ3Oit2XqbilL7kjet9nVx108gAUCcNoIOw3Q3WO9EGo7ZIDwZ Ydd9Wp0ECrsRwEg6G6/OBpinArdY00QIa44ZPAUf1O05JRmCIxsgp/BNKyIvvqBZQ67dIJ/huAUS6 r3uXW5U/sp3m8s8kLzkyP8HpsAEpDIdsTnF420C51Pt9j3PcaCHcLji0ZYxRQlwhX8TyZTTIgsXHb CgyZt/YZZe76Kykf32O/iDm+06GiBNPAKyCHDPmvnTMkB2L1XT39EUfqYRRJq1qi8GBO8Mid+zFsW 8DyhT5eQ==; Received: from [2001:4bb8:18c:1dd6:48f3:741a:602e:7fdd] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj2tA-0000L7-0P; Sat, 28 Nov 2020 16:15:56 +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 26/45] block: remove ->bd_contains Date: Sat, 28 Nov 2020 17:14:51 +0100 Message-Id: <20201128161510.347752-27-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-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: Now that each hd_struct has a reference to the corresponding block_device, there is no need for the bd_contains pointer. Add a bdev_whole() helper to look up the whole device block_device struture instead. Signed-off-by: Christoph Hellwig Reviewed-by: Greg Kroah-Hartman Reviewed-by: Jan Kara Acked-by: Tejun Heo --- drivers/block/loop.c | 2 +- drivers/scsi/scsicam.c | 2 +- fs/block_dev.c | 22 ++++++++-------------- include/linux/blk_types.h | 4 +++- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 26c7aafba7c5f8..c0df88b3300c41 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1088,7 +1088,7 @@ static int loop_configure(struct loop_device *lo, f= mode_t mode, * here to avoid changing device under exclusive owner. */ if (!(mode & FMODE_EXCL)) { - claimed_bdev =3D bdev->bd_contains; + claimed_bdev =3D bdev_whole(bdev); error =3D bd_prepare_to_claim(bdev, claimed_bdev, loop_configure); if (error) goto out_putf; diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c index 682cf08ab04153..f1553a453616fd 100644 --- a/drivers/scsi/scsicam.c +++ b/drivers/scsi/scsicam.c @@ -32,7 +32,7 @@ */ unsigned char *scsi_bios_ptable(struct block_device *dev) { - struct address_space *mapping =3D dev->bd_contains->bd_inode->i_mapping= ; + struct address_space *mapping =3D bdev_whole(dev)->bd_inode->i_mapping; unsigned char *res =3D NULL; struct page *page; =20 diff --git a/fs/block_dev.c b/fs/block_dev.c index b350ed3af83bad..94baee369d26e5 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -119,7 +119,7 @@ int truncate_bdev_range(struct block_device *bdev, fm= ode_t mode, * under live filesystem. */ if (!(mode & FMODE_EXCL)) { - claimed_bdev =3D bdev->bd_contains; + claimed_bdev =3D bdev_whole(bdev); err =3D bd_prepare_to_claim(bdev, claimed_bdev, truncate_bdev_range); if (err) @@ -880,7 +880,6 @@ struct block_device *bdev_alloc(struct gendisk *disk,= u8 partno) spin_lock_init(&bdev->bd_size_lock); bdev->bd_disk =3D disk; bdev->bd_partno =3D partno; - bdev->bd_contains =3D NULL; bdev->bd_super =3D NULL; bdev->bd_inode =3D inode; bdev->bd_part_count =3D 0; @@ -1347,9 +1346,7 @@ static int __blkdev_get(struct block_device *bdev, = fmode_t mode) int ret; =20 if (!bdev->bd_openers) { - bdev->bd_contains =3D bdev; - - if (!bdev->bd_partno) { + if (!bdev_is_partition(bdev)) { ret =3D -ENXIO; bdev->bd_part =3D disk_get_part(disk, 0); if (!bdev->bd_part) @@ -1389,7 +1386,6 @@ static int __blkdev_get(struct block_device *bdev, = fmode_t mode) whole->bd_part_count++; mutex_unlock(&whole->bd_mutex); =20 - bdev->bd_contains =3D whole; bdev->bd_part =3D disk_get_part(disk, bdev->bd_partno); if (!(disk->flags & GENHD_FL_UP) || !bdev->bd_part || !bdev->bd_part->nr_sects) { @@ -1405,7 +1401,7 @@ static int __blkdev_get(struct block_device *bdev, = fmode_t mode) if (bdev->bd_bdi =3D=3D &noop_backing_dev_info) bdev->bd_bdi =3D bdi_get(disk->queue->backing_dev_info); } else { - if (bdev->bd_contains =3D=3D bdev) { + if (!bdev_is_partition(bdev)) { ret =3D 0; if (bdev->bd_disk->fops->open) ret =3D bdev->bd_disk->fops->open(bdev, mode); @@ -1423,7 +1419,6 @@ static int __blkdev_get(struct block_device *bdev, = fmode_t mode) out_clear: disk_put_part(bdev->bd_part); bdev->bd_part =3D NULL; - bdev->bd_contains =3D NULL; return ret; } =20 @@ -1670,8 +1665,7 @@ static void __blkdev_put(struct block_device *bdev,= fmode_t mode, int for_part) disk_put_part(bdev->bd_part); bdev->bd_part =3D NULL; if (bdev_is_partition(bdev)) - victim =3D bdev->bd_contains; - bdev->bd_contains =3D NULL; + victim =3D bdev_whole(bdev); } else { if (!bdev_is_partition(bdev) && disk->fops->release) disk->fops->release(disk, mode); @@ -1690,6 +1684,7 @@ void blkdev_put(struct block_device *bdev, fmode_t = mode) mutex_lock(&bdev->bd_mutex); =20 if (mode & FMODE_EXCL) { + struct block_device *whole =3D bdev_whole(bdev); bool bdev_free; =20 /* @@ -1700,13 +1695,12 @@ void blkdev_put(struct block_device *bdev, fmode_= t mode) spin_lock(&bdev_lock); =20 WARN_ON_ONCE(--bdev->bd_holders < 0); - WARN_ON_ONCE(--bdev->bd_contains->bd_holders < 0); + WARN_ON_ONCE(--whole->bd_holders < 0); =20 - /* bd_contains might point to self, check in a separate step */ if ((bdev_free =3D !bdev->bd_holders)) bdev->bd_holder =3D NULL; - if (!bdev->bd_contains->bd_holders) - bdev->bd_contains->bd_holder =3D NULL; + if (!whole->bd_holders) + whole->bd_holder =3D NULL; =20 spin_unlock(&bdev_lock); =20 diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 9698f459cc65c9..2e0a9bd9688d28 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -32,7 +32,6 @@ struct block_device { #ifdef CONFIG_SYSFS struct list_head bd_holder_disks; #endif - struct block_device * bd_contains; u8 bd_partno; struct hd_struct * bd_part; /* number of times partitions within this device have been opened. */ @@ -49,6 +48,9 @@ struct block_device { struct super_block *bd_fsfreeze_sb; } __randomize_layout; =20 +#define bdev_whole(_bdev) \ + ((_bdev)->bd_disk->part0.bdev) + #define bdev_kobj(_bdev) \ (&part_to_dev((_bdev)->bd_part)->kobj) =20 --=20 2.29.2