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 53F8BC64E7A for ; Thu, 26 Nov 2020 13:32:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C87CE206F7 for ; Thu, 26 Nov 2020 13:32:24 +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="ObNpBS6e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C87CE206F7 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 F23286B008C; Thu, 26 Nov 2020 08:32:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E82BA6B0092; Thu, 26 Nov 2020 08:32:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D48C06B0093; Thu, 26 Nov 2020 08:32:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0096.hostedemail.com [216.40.44.96]) by kanga.kvack.org (Postfix) with ESMTP id B5A856B008C for ; Thu, 26 Nov 2020 08:32:22 -0500 (EST) Received: from smtpin28.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 86A88180AD811 for ; Thu, 26 Nov 2020 13:32:22 +0000 (UTC) X-FDA: 77526658524.28.bee06_5b0dd9f2737f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin28.hostedemail.com (Postfix) with ESMTP id 6893A6D66 for ; Thu, 26 Nov 2020 13:32:22 +0000 (UTC) X-HE-Tag: bee06_5b0dd9f2737f X-Filterd-Recvd-Size: 9325 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Nov 2020 13:32:21 +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=BQcek4m3yWABZ+dx/WiWy+1fJw3es+Bc+lvaZ4inu9c=; b=ObNpBS6e3dv1B+pEgGrY5Ta9DN Q3qYUXZyTruHkEGafQUJ1CalZAd5EtsTd7ybHljioFm8OxKdkAQ8f8uSHN3n1GRp9F2+AORR9L9fr QQLST7btmRc45KSAQf0X9/kQkAbiWsefqO2U7rFUzLI/g1nf3xU2IvbjuDOMaCWytE/K/XeEYBlJm z599ZkH4fXMPwG+mC9a5t0bVJy9MopskGhs7CbNpx5XACAX7Tv4sqYyE8vwz9ObAA+c0d1mcZvPGm d3bVigMlXA1CXjFRziU+MGWeB2AlpLhyy1w5AX8Bbwx6+sRkCLkAU80qkVHfIQJUQ4qy5bjpevjsz yVrruxwg==; 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 1kiGzp-0004E3-Vf; Thu, 26 Nov 2020 13:07:38 +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 44/44] block: stop using bdget_disk for partition 0 Date: Thu, 26 Nov 2020 14:04:22 +0100 Message-Id: <20201126130422.92945-45-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: We can just dereference the point in struct gendisk instead. Also remove the now unused export. Signed-off-by: Christoph Hellwig --- block/genhd.c | 1 - drivers/block/nbd.c | 4 +--- drivers/block/xen-blkfront.c | 20 +++++--------------- drivers/block/zram/zram_drv.c | 14 ++------------ drivers/md/dm.c | 16 ++-------------- drivers/s390/block/dasd_ioctl.c | 5 ++--- fs/block_dev.c | 2 +- 7 files changed, 13 insertions(+), 49 deletions(-) diff --git a/block/genhd.c b/block/genhd.c index af76c2fff40d31..01876a162f5813 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -920,7 +920,6 @@ struct block_device *bdget_disk(struct gendisk *disk,= int partno) =20 return bdev; } -EXPORT_SYMBOL(bdget_disk); =20 /* * print a full list of all partitions - intended for places where the r= oot diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 014683968ce174..92f84ed0ba9eb6 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1488,12 +1488,10 @@ static int nbd_open(struct block_device *bdev, fm= ode_t mode) static void nbd_release(struct gendisk *disk, fmode_t mode) { struct nbd_device *nbd =3D disk->private_data; - struct block_device *bdev =3D bdget_disk(disk, 0); =20 if (test_bit(NBD_RT_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &= & - bdev->bd_openers =3D=3D 0) + disk->part0->bd_openers =3D=3D 0) nbd_disconnect_and_put(nbd); - bdput(bdev); =20 nbd_config_put(nbd); nbd_put(nbd); diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 79521e33d30ed5..188e0b47534bcf 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2153,7 +2153,7 @@ static void blkfront_closing(struct blkfront_info *= info) } =20 if (info->gd) - bdev =3D bdget_disk(info->gd, 0); + bdev =3D bdgrab(info->gd->part0); =20 mutex_unlock(&info->mutex); =20 @@ -2518,7 +2518,7 @@ static int blkfront_remove(struct xenbus_device *xb= dev) =20 disk =3D info->gd; if (disk) - bdev =3D bdget_disk(disk, 0); + bdev =3D bdgrab(disk->part0); =20 info->xbdev =3D NULL; mutex_unlock(&info->mutex); @@ -2595,19 +2595,11 @@ static int blkif_open(struct block_device *bdev, = fmode_t mode) static void blkif_release(struct gendisk *disk, fmode_t mode) { struct blkfront_info *info =3D disk->private_data; - struct block_device *bdev; struct xenbus_device *xbdev; =20 mutex_lock(&blkfront_mutex); - - bdev =3D bdget_disk(disk, 0); - - if (!bdev) { - WARN(1, "Block device %s yanked out from us!\n", disk->disk_name); + if (disk->part0->bd_openers) goto out_mutex; - } - if (bdev->bd_openers) - goto out; =20 /* * Check if we have been instructed to close. We will have @@ -2619,7 +2611,7 @@ static void blkif_release(struct gendisk *disk, fmo= de_t mode) =20 if (xbdev && xbdev->state =3D=3D XenbusStateClosing) { /* pending switch to state closed */ - dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n"); + dev_info(disk_to_dev(disk), "releasing disk\n"); xlvbd_release_gendisk(info); xenbus_frontend_closed(info->xbdev); } @@ -2628,14 +2620,12 @@ static void blkif_release(struct gendisk *disk, f= mode_t mode) =20 if (!xbdev) { /* sudden device removal */ - dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n"); + dev_info(disk_to_dev(disk), "releasing disk\n"); xlvbd_release_gendisk(info); disk->private_data =3D NULL; free_info(info); } =20 -out: - bdput(bdev); out_mutex: mutex_unlock(&blkfront_mutex); } diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.= c index dc8957d173d37c..b0701bae6e9800 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1760,15 +1760,12 @@ static ssize_t reset_store(struct device *dev, return -EINVAL; =20 zram =3D dev_to_zram(dev); - bdev =3D bdget_disk(zram->disk, 0); - if (!bdev) - return -ENOMEM; + bdev =3D zram->disk->part0; =20 mutex_lock(&bdev->bd_mutex); /* Do not reset an active device or claimed device */ if (bdev->bd_openers || zram->claim) { mutex_unlock(&bdev->bd_mutex); - bdput(bdev); return -EBUSY; } =20 @@ -1779,7 +1776,6 @@ static ssize_t reset_store(struct device *dev, /* Make sure all the pending I/O are finished */ fsync_bdev(bdev); zram_reset_device(zram); - bdput(bdev); =20 mutex_lock(&bdev->bd_mutex); zram->claim =3D false; @@ -1965,16 +1961,11 @@ static int zram_add(void) =20 static int zram_remove(struct zram *zram) { - struct block_device *bdev; - - bdev =3D bdget_disk(zram->disk, 0); - if (!bdev) - return -ENOMEM; + struct block_device *bdev =3D zram->disk->part0; =20 mutex_lock(&bdev->bd_mutex); if (bdev->bd_openers || zram->claim) { mutex_unlock(&bdev->bd_mutex); - bdput(bdev); return -EBUSY; } =20 @@ -1986,7 +1977,6 @@ static int zram_remove(struct zram *zram) /* Make sure all the pending I/O are finished */ fsync_bdev(bdev); zram_reset_device(zram); - bdput(bdev); =20 pr_info("Removed device: %s\n", zram->disk->disk_name); =20 diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 176adcff56b380..ed7e836efbcdbc 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2375,16 +2375,11 @@ struct dm_table *dm_swap_table(struct mapped_devi= ce *md, struct dm_table *table) */ static int lock_fs(struct mapped_device *md) { - struct block_device *bdev; int r; =20 WARN_ON(test_bit(DMF_FROZEN, &md->flags)); =20 - bdev =3D bdget_disk(md->disk, 0); - if (!bdev) - return -ENOMEM; - r =3D freeze_bdev(bdev); - bdput(bdev); + r =3D freeze_bdev(md->disk->part0); if (!r) set_bit(DMF_FROZEN, &md->flags); return r; @@ -2392,16 +2387,9 @@ static int lock_fs(struct mapped_device *md) =20 static void unlock_fs(struct mapped_device *md) { - struct block_device *bdev; - if (!test_bit(DMF_FROZEN, &md->flags)) return; - - bdev =3D bdget_disk(md->disk, 0); - if (!bdev) - return; - thaw_bdev(bdev); - bdput(bdev); + thaw_bdev(md->disk->part0); clear_bit(DMF_FROZEN, &md->flags); } =20 diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_io= ctl.c index 304eba1acf163c..9f642440894655 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -220,9 +220,8 @@ dasd_format(struct dasd_block *block, struct format_d= ata_t *fdata) * enabling the device later. */ if (fdata->start_unit =3D=3D 0) { - struct block_device *bdev =3D bdget_disk(block->gdp, 0); - bdev->bd_inode->i_blkbits =3D blksize_bits(fdata->blksize); - bdput(bdev); + block->gdp->part0->bd_inode->i_blkbits =3D + blksize_bits(fdata->blksize); } =20 rc =3D base->discipline->format_device(base, fdata, 1); diff --git a/fs/block_dev.c b/fs/block_dev.c index 58fd6625966511..4edb9f23092285 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1295,7 +1295,7 @@ static int __blkdev_get(struct block_device *bdev, = fmode_t mode) if (ret) return ret; } else { - struct block_device *whole =3D bdget_disk(disk, 0); + struct block_device *whole =3D bdgrab(disk->part0); =20 mutex_lock_nested(&whole->bd_mutex, 1); ret =3D __blkdev_get(whole, mode); --=20 2.29.2