Commit 73781b3b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240626142637.300624-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3302f6f0

block/blk-settings.c

+1 −7
Original line number Diff line number Diff line
@@ -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

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -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);



/*

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -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);