From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
Naohiro Aota <naohiro.aota@wdc.com>,
linux-block@vger.kernel.org, linux-btrfs@vger.kernel.org,
Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
Subject: [PATCH 10/10] block: remove bdput
Date: Sat, 24 Jul 2021 09:12:49 +0200 [thread overview]
Message-ID: <20210724071249.1284585-11-hch@lst.de> (raw)
In-Reply-To: <20210724071249.1284585-1-hch@lst.de>
Now that we've stopped using inode references for anything meaninful
in the block layer get rid of the helper to put it and just open code
the call to iput on the block_device inode.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
---
block/genhd.c | 4 ++--
block/partitions/core.c | 2 +-
fs/block_dev.c | 6 ------
include/linux/blkdev.h | 1 -
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index 7b4beadaa694..700d9d291546 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1077,7 +1077,7 @@ static void disk_release(struct device *dev)
xa_destroy(&disk->part_tbl);
if (test_bit(GD_QUEUE_REF, &disk->state) && disk->queue)
blk_put_queue(disk->queue);
- bdput(disk->part0); /* frees the disk */
+ iput(disk->part0->bd_inode); /* frees the disk */
}
struct class block_class = {
.name = "block",
@@ -1262,7 +1262,7 @@ struct gendisk *__alloc_disk_node(int minors, int node_id)
out_destroy_part_tbl:
xa_destroy(&disk->part_tbl);
- bdput(disk->part0);
+ iput(disk->part0->bd_inode);
out_free_disk:
kfree(disk);
return NULL;
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 1b02073a2047..8d8be1187b9e 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -262,7 +262,7 @@ static void part_release(struct device *dev)
if (MAJOR(dev->devt) == BLOCK_EXT_MAJOR)
blk_free_ext_minor(MINOR(dev->devt));
put_disk(dev_to_bdev(dev)->bd_disk);
- bdput(dev_to_bdev(dev));
+ iput(dev_to_bdev(dev)->bd_inode);
}
static int part_uevent(struct device *dev, struct kobj_uevent_env *env)
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4f2c4e9e84f5..6658f40ae492 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -934,12 +934,6 @@ long nr_blockdev_pages(void)
return ret;
}
-void bdput(struct block_device *bdev)
-{
- iput(bdev->bd_inode);
-}
-EXPORT_SYMBOL(bdput);
-
/**
* bd_may_claim - test whether a block device can be claimed
* @bdev: block device of interest
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 98772da38bb1..b94de1d194b8 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1984,7 +1984,6 @@ void blkdev_put_no_open(struct block_device *bdev);
struct block_device *bdev_alloc(struct gendisk *disk, u8 partno);
void bdev_add(struct block_device *bdev, dev_t dev);
struct block_device *I_BDEV(struct inode *inode);
-void bdput(struct block_device *);
int truncate_bdev_range(struct block_device *bdev, fmode_t mode, loff_t lstart,
loff_t lend);
--
2.30.2
next prev parent reply other threads:[~2021-07-24 7:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-24 7:12 fixes and cleanups for block_device refcounting v3 Christoph Hellwig
2021-07-24 7:12 ` [PATCH 01/10] block: delay freeing the gendisk Christoph Hellwig
2021-07-24 7:12 ` [PATCH 02/10] block: assert the locking state in delete_partition Christoph Hellwig
2021-07-24 7:12 ` [PATCH 03/10] block: unhash the block device inodes earlier Christoph Hellwig
2021-07-26 10:15 ` Ming Lei
2021-07-24 7:12 ` [PATCH 04/10] block: remove the GENHD_FL_UP check in blkdev_get_no_open Christoph Hellwig
2021-07-26 10:16 ` Ming Lei
2021-07-24 7:12 ` [PATCH 05/10] block: allocate bd_meta_info later in add_partitions Christoph Hellwig
2021-07-24 7:12 ` [PATCH 06/10] block: change the refcounting for partitions Christoph Hellwig
2021-07-26 2:20 ` Damien Le Moal
2021-07-26 10:17 ` Ming Lei
2021-07-24 7:12 ` [PATCH 07/10] btrfs: store a block_device in struct btrfs_ordered_extent Christoph Hellwig
2021-07-24 7:12 ` [PATCH 08/10] loop: don't grab a reference to the block device Christoph Hellwig
2021-07-24 7:12 ` [PATCH 09/10] block: remove bdgrab Christoph Hellwig
2021-07-24 7:12 ` Christoph Hellwig [this message]
2021-07-24 7:22 ` fixes and cleanups for block_device refcounting v3 Christoph Hellwig
2021-07-24 16:06 ` Jens Axboe
2021-07-24 16:54 ` Christoph Hellwig
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=20210724071249.1284585-11-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=ckulkarnilinux@gmail.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=naohiro.aota@wdc.com \
/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).