[v2] block: Cleanup set_capacity()/bdev_set_nr_sectors()

Commit Message

Damien Le Moal April 24, 2023, 1:13 p.m. UTC

The code for setting a block device capacity (bd_nr_sectors field of
struct block_device) is duplicated in set_capacity() and
bdev_set_nr_sectors(). Clean this up by making bdev_set_nr_sectors()
a block layer internal function defined in block/bdev.c instead of
having this function statically defined in block/partitions/core.c.
With this change, set_capacity() implementation can be simplified to
only calling bdev_set_nr_sectors().

Signed-off-by: Damien Le Moal <[e-mail]>
---
Changes from v1:
 - Addressed Christoph's comments: keep set_capacity as a regular
   exported function

 block/bdev.c            | 8 ++++++++
 block/blk.h             | 2 ++
 block/genhd.c           | 7 +------
 block/partitions/core.c | 8 --------
 4 files changed, 11 insertions(+), 14 deletions(-)

Comments

Christoph Hellwig April 24, 2023, 1:43 p.m. UTC | #1

Looks good:

Reviewed-by: Christoph Hellwig <[e-mail]>

Jens Axboe April 24, 2023, 2:50 p.m. UTC | #2

On Mon, 24 Apr 2023 22:13:18 +0900, Damien Le Moal wrote:
> The code for setting a block device capacity (bd_nr_sectors field of
> struct block_device) is duplicated in set_capacity() and
> bdev_set_nr_sectors(). Clean this up by making bdev_set_nr_sectors()
> a block layer internal function defined in block/bdev.c instead of
> having this function statically defined in block/partitions/core.c.
> With this change, set_capacity() implementation can be simplified to
> only calling bdev_set_nr_sectors().
> 
> [...]

Applied, thanks!

[1/1] block: Cleanup set_capacity()/bdev_set_nr_sectors()
      commit: 83794367dcc6749662b17a1e4b8ec085023fc53b

Best regards,

Patch

diff --git a/block/bdev.c b/block/bdev.c
index 850852fe4b78..717089a5726f 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -428,6 +428,14 @@  struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
 	return bdev;
 }
 
+void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors)
+{
+	spin_lock(&bdev->bd_size_lock);
+	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);
+	bdev->bd_nr_sectors = sectors;
+	spin_unlock(&bdev->bd_size_lock);
+}
+
 void bdev_add(struct block_device *bdev, dev_t dev)
 {
 	bdev->bd_dev = dev;
diff --git a/block/blk.h b/block/blk.h
index 2da831103471..564119a76bc5 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -419,6 +419,8 @@  int bdev_resize_partition(struct gendisk *disk, int partno, sector_t start,
 		sector_t length);
 void blk_drop_partitions(struct gendisk *disk);
 
+void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors);
+
 struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
 		struct lock_class_key *lkclass);
 
diff --git a/block/genhd.c b/block/genhd.c
index 2d58ac54043a..08f701cb8553 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -57,12 +57,7 @@  static DEFINE_IDA(ext_devt_ida);
 
 void set_capacity(struct gendisk *disk, sector_t sectors)
 {
-	struct block_device *bdev = disk->part0;
-
-	spin_lock(&bdev->bd_size_lock);
-	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);
-	bdev->bd_nr_sectors = sectors;
-	spin_unlock(&bdev->bd_size_lock);
+	bdev_set_nr_sectors(disk->part0, sectors);
 }
 EXPORT_SYMBOL(set_capacity);
 
diff --git a/block/partitions/core.c b/block/partitions/core.c
index 7b8ef6296abd..49e0496ff23c 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -85,14 +85,6 @@  static int (*check_part[])(struct parsed_partitions *) = {
 	NULL
 };
 
-static void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors)
-{
-	spin_lock(&bdev->bd_size_lock);
-	i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);
-	bdev->bd_nr_sectors = sectors;
-	spin_unlock(&bdev->bd_size_lock);
-}
-
 static struct parsed_partitions *allocate_partitions(struct gendisk *hd)
 {
 	struct parsed_partitions *state;