From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
Josef Bacik <josef@toxicpanda.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Coly Li <colyli@suse.de>, Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, Richard Weinberger <richard@nod.at>,
Jan Kara <jack@suse.com>,
linux-block@vger.kernel.org, xen-devel@lists.xenproject.org,
linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCH 16/20] block: stop using bdget_disk for partition 0
Date: Thu, 19 Nov 2020 15:43:16 +0100 [thread overview]
Message-ID: <20201119144316.GY1981@quack2.suse.cz> (raw)
In-Reply-To: <20201118084800.2339180-17-hch@lst.de>
On Wed 18-11-20 09:47:56, Christoph Hellwig wrote:
> We can just dereference the point in struct gendisk instead. Also
> remove the now unused export.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> block/genhd.c | 1 -
> drivers/block/nbd.c | 4 +---
> drivers/block/xen-blkfront.c | 20 +++++---------------
> drivers/block/zram/zram_drv.c | 18 +++---------------
> drivers/md/dm.c | 8 +-------
> drivers/s390/block/dasd_ioctl.c | 5 ++---
> 6 files changed, 12 insertions(+), 44 deletions(-)
>
> diff --git a/block/genhd.c b/block/genhd.c
> index a14e2408e3d4e8..ec41d0f18f5ce1 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -907,7 +907,6 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno)
>
> return bdev;
> }
> -EXPORT_SYMBOL(bdget_disk);
>
> /*
> * print a full list of all partitions - intended for places where the root
> 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, fmode_t mode)
> static void nbd_release(struct gendisk *disk, fmode_t mode)
> {
> struct nbd_device *nbd = disk->private_data;
> - struct block_device *bdev = bdget_disk(disk, 0);
>
> if (test_bit(NBD_RT_DISCONNECT_ON_CLOSE, &nbd->config->runtime_flags) &&
> - bdev->bd_openers == 0)
> + disk->part0->bd_openers == 0)
> nbd_disconnect_and_put(nbd);
> - bdput(bdev);
>
> 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)
> }
>
> if (info->gd)
> - bdev = bdget_disk(info->gd, 0);
> + bdev = bdgrab(info->gd->part0);
>
> mutex_unlock(&info->mutex);
>
> @@ -2518,7 +2518,7 @@ static int blkfront_remove(struct xenbus_device *xbdev)
>
> disk = info->gd;
> if (disk)
> - bdev = bdget_disk(disk, 0);
> + bdev = bdgrab(disk->part0);
>
> info->xbdev = 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 = disk->private_data;
> - struct block_device *bdev;
> struct xenbus_device *xbdev;
>
> mutex_lock(&blkfront_mutex);
> -
> - bdev = 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;
>
> /*
> * Check if we have been instructed to close. We will have
> @@ -2619,7 +2611,7 @@ static void blkif_release(struct gendisk *disk, fmode_t mode)
>
> if (xbdev && xbdev->state == 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, fmode_t mode)
>
> 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 = NULL;
> free_info(info);
> }
>
> -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 01757f9578dcb8..56024905bd242c 100644
> --- a/drivers/block/zram/zram_drv.c
> +++ b/drivers/block/zram/zram_drv.c
> @@ -1748,7 +1748,7 @@ static ssize_t reset_store(struct device *dev,
> struct device_attribute *attr, const char *buf, size_t len)
> {
> struct zram *zram = dev_to_zram(dev);
> - struct block_device *bdev;
> + struct block_device *bdev = zram->disk->part0;
> unsigned short do_reset;
> int ret = 0;
>
> @@ -1758,17 +1758,12 @@ static ssize_t reset_store(struct device *dev,
> if (!do_reset)
> return -EINVAL;
>
> - bdev = bdget_disk(zram->disk, 0);
> - if (!bdev)
> - return -ENOMEM;
> -
> mutex_lock(&bdev->bd_mutex);
> if (bdev->bd_openers)
> ret = -EBUSY;
> else
> zram_reset_device(zram);
> mutex_unlock(&bdev->bd_mutex);
> - bdput(bdev);
>
> return ret ? ret : len;
> }
> @@ -1933,15 +1928,8 @@ static int zram_add(void)
>
> static int zram_remove(struct zram *zram)
> {
> - struct block_device *bdev = bdget_disk(zram->disk, 0);
> -
> - if (bdev) {
> - if (bdev->bd_openers) {
> - bdput(bdev);
> - return -EBUSY;
> - }
> - bdput(bdev);
> - }
> + if (zram->disk->part0->bd_openers)
> + return -EBUSY;
>
> del_gendisk(zram->disk);
> zram_debugfs_unregister(zram);
> diff --git a/drivers/md/dm.c b/drivers/md/dm.c
> index c9438feefe55a3..ec48ccae50dd53 100644
> --- a/drivers/md/dm.c
> +++ b/drivers/md/dm.c
> @@ -2375,17 +2375,12 @@ struct dm_table *dm_swap_table(struct mapped_device *md, struct dm_table *table)
> */
> static int lock_fs(struct mapped_device *md)
> {
> - struct block_device *bdev;
> int r;
>
> WARN_ON(md->frozen_sb);
>
> - bdev = bdget_disk(md->disk, 0);
> - if (!bdev)
> - return -ENOMEM;
> - md->frozen_sb = freeze_bdev(bdev);
> + md->frozen_sb = freeze_bdev(md->disk->part0);
> if (IS_ERR(md->frozen_sb)) {
> - bdput(bdev);
> r = PTR_ERR(md->frozen_sb);
> md->frozen_sb = NULL;
> return r;
> @@ -2402,7 +2397,6 @@ static void unlock_fs(struct mapped_device *md)
> return;
>
> thaw_bdev(md->frozen_sb->s_bdev, md->frozen_sb);
> - bdput(md->frozen_sb->s_bdev);
> md->frozen_sb = NULL;
> clear_bit(DMF_FROZEN, &md->flags);
> }
> diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.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_data_t *fdata)
> * enabling the device later.
> */
> if (fdata->start_unit == 0) {
> - struct block_device *bdev = bdget_disk(block->gdp, 0);
> - bdev->bd_inode->i_blkbits = blksize_bits(fdata->blksize);
> - bdput(bdev);
> + block->gdp->part0->bd_inode->i_blkbits =
> + blksize_bits(fdata->blksize);
> }
>
> rc = base->discipline->format_device(base, fdata, 1);
> --
> 2.29.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-11-19 14:43 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 8:47 merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-18 8:47 ` [PATCH 01/20] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-18 14:09 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-24 12:26 ` Tejun Heo
2020-11-18 8:47 ` [PATCH 02/20] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-18 14:10 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 03/20] block: add a bdev_kobj helper Christoph Hellwig
2020-11-18 14:18 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 04/20] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-18 14:19 ` Jan Kara
2020-11-19 8:37 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 05/20] block: use put_device in put_disk Christoph Hellwig
2020-11-18 14:20 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 06/20] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-18 14:22 ` Jan Kara
2020-11-18 8:47 ` [PATCH 07/20] init: refactor name_to_dev_t Christoph Hellwig
2020-11-18 14:37 ` Jan Kara
2020-11-19 7:52 ` Christoph Hellwig
2020-11-19 8:25 ` Jan Kara
2020-11-20 8:49 ` Christoph Hellwig
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 08/20] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-18 14:41 ` Jan Kara
2020-11-18 8:47 ` [PATCH 09/20] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-18 14:42 ` Jan Kara
2020-11-19 8:38 ` Johannes Thumshirn
2020-11-18 8:47 ` [PATCH 10/20] block: refactor __blkdev_put Christoph Hellwig
2020-11-18 14:46 ` Jan Kara
2020-11-18 8:47 ` [PATCH 11/20] block: reference struct block_device from struct hd_struct Christoph Hellwig
2020-11-19 9:41 ` Jan Kara
2020-11-20 8:56 ` Christoph Hellwig
2020-11-24 16:59 ` Tejun Heo
2020-11-25 11:40 ` Jan Kara
2020-11-25 12:09 ` Tejun Heo
2020-11-18 8:47 ` [PATCH 12/20] block: simplify the block device claiming interface Christoph Hellwig
2020-11-19 10:07 ` Jan Kara
2020-11-18 8:47 ` [PATCH 13/20] block: remove ->bd_contains Christoph Hellwig
2020-11-19 10:32 ` Jan Kara
2020-11-20 9:01 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 14/20] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-19 12:05 ` Jan Kara
2020-11-20 9:08 ` Christoph Hellwig
2020-11-20 11:21 ` Jan Kara
2020-11-20 15:32 ` Christoph Hellwig
2020-11-20 15:59 ` Matthew Wilcox
2020-11-20 16:01 ` Christoph Hellwig
2020-11-20 20:05 ` Jan Kara
2020-11-21 16:24 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 15/20] block: merge struct block_device and " Christoph Hellwig
2020-11-19 14:39 ` Jan Kara
2020-11-20 9:15 ` Christoph Hellwig
2020-11-20 10:53 ` Jan Kara
2020-11-18 8:47 ` [PATCH 16/20] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-19 14:43 ` Jan Kara [this message]
2020-11-18 8:47 ` [PATCH 17/20] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-19 14:53 ` Jan Kara
2020-11-19 15:13 ` Matthew Wilcox
2020-11-20 9:17 ` Christoph Hellwig
2020-11-18 8:47 ` [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-19 14:59 ` Jan Kara
2020-11-18 8:47 ` [PATCH 19/20] bcache: remove a superflous lookup_bdev all Christoph Hellwig
2020-11-18 8:54 ` Coly Li
2020-11-18 9:10 ` Greg KH
2020-11-18 9:55 ` Coly Li
2020-11-18 16:24 ` Christoph Hellwig
2020-11-18 8:48 ` [PATCH 20/20] block: remove i_bdev Christoph Hellwig
2020-11-18 8:56 ` merge struct block_device and struct hd_struct Jan Beulich
2020-11-18 8:58 ` Christoph Hellwig
2020-11-18 9:04 ` Jan Beulich
2020-11-18 9:08 ` Christoph Hellwig
2020-11-18 9:09 ` Greg KH
2020-11-18 9:23 ` Jan Beulich
2020-11-18 9:32 ` Greg KH
2020-11-18 12:50 ` Matthew Wilcox
2020-11-18 9:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201119144316.GY1981@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=jack@suse.com \
--cc=josef@toxicpanda.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=snitzer@redhat.com \
--cc=tj@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).