block: remove disk_update_readahead

Mark blk_apply_bdi_limits non-static and open code disk_update_readahead
in the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240626142637.300624-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-settings.c b/block/blk-settings.c
index c2221b7406d46af137a25cae26ad09e4d49b0ceb..c692e80bb4f890738306e319a37a2d88fe03ca06 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -55,7 +55,7 @@ void blk_set_stacking_limits(struct queue_limits *lim)
 }
 EXPORT_SYMBOL(blk_set_stacking_limits);
 
-static void blk_apply_bdi_limits(struct backing_dev_info *bdi,
+void blk_apply_bdi_limits(struct backing_dev_info *bdi,
                struct queue_limits *lim)
 {
        /*
@@ -434,12 +434,6 @@ int queue_limits_set(struct request_queue *q, struct queue_limits *lim)
 }
 EXPORT_SYMBOL_GPL(queue_limits_set);
 
-void disk_update_readahead(struct gendisk *disk)
-{
-       blk_apply_bdi_limits(disk->bdi, &disk->queue->limits);
-}
-EXPORT_SYMBOL_GPL(disk_update_readahead);
-
 /**
  * blk_limits_io_min - set minimum request size for a device
  * @limits: the queue limits

diff --git a/block/blk.h b/block/blk.h
index d0a986d8ee507e12b63d76463cacf903fc4b6507..95e5a4f81693c40e8006b42fcbc0ca08915acbd4 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -358,6 +358,8 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio);
 enum elv_merge blk_try_merge(struct request *rq, struct bio *bio);
 
 int blk_set_default_limits(struct queue_limits *lim);
+void blk_apply_bdi_limits(struct backing_dev_info *bdi,
+               struct queue_limits *lim);
 int blk_dev_init(void);
 
 /*

diff --git a/block/genhd.c b/block/genhd.c
index 8f1f3c6b4d6729f1540750af7955a7344720f5d1..4dc95a46350532bbb5ac2639cea5fabb7a1dd563 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -524,7 +524,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
                disk->part0->bd_dev = MKDEV(disk->major, disk->first_minor);
        }
 
-       disk_update_readahead(disk);
+       blk_apply_bdi_limits(disk->bdi, &disk->queue->limits);
        disk_add_events(disk);
        set_bit(GD_ADDED, &disk->state);
        return 0;

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index b37826b350a2e3a0ebc0a728d2f547f61aaa672b..6b88382012e9584b0a25ce77d0939240b22a788f 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -973,7 +973,6 @@ static inline void blk_queue_disable_write_zeroes(struct request_queue *q)
 /*
  * Access functions for manipulating queue properties
  */
-void disk_update_readahead(struct gendisk *disk);
 extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min);
 extern void blk_limits_io_opt(struct queue_limits *limits, unsigned int opt);
 extern void blk_set_queue_depth(struct request_queue *q, unsigned int depth);