Commit 471aa704 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: pass a gendisk to blk_queue_update_readahead 



.. and rename the function to disk_update_readahead.  This is in
preparation for moving the BDI from the request_queue to the gendisk.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20210809141744.1203023-3-hch@lst.de


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

block/blk-settings.c

+5 −3
Original line number Diff line number Diff line
@@ -380,8 +380,10 @@ void blk_queue_alignment_offset(struct request_queue *q, unsigned int offset) 
}

EXPORT_SYMBOL(blk_queue_alignment_offset);



void blk_queue_update_readahead(struct request_queue *q)

void disk_update_readahead(struct gendisk *disk)

{

	struct request_queue *q = disk->queue;



	/*

	 * For read-ahead of large files to be effective, we need to read ahead

	 * at least twice the optimal I/O size.
@@ -391,7 +393,7 @@ void blk_queue_update_readahead(struct request_queue *q) 
	q->backing_dev_info->io_pages =

		queue_max_sectors(q) >> (PAGE_SHIFT - 9);

}

EXPORT_SYMBOL_GPL(blk_queue_update_readahead);

EXPORT_SYMBOL_GPL(disk_update_readahead);



/**

 * blk_limits_io_min - set minimum request size for a device
@@ -665,7 +667,7 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, 
		pr_notice("%s: Warning: Device %pg is misaligned\n",

			disk->disk_name, bdev);



	blk_queue_update_readahead(disk->queue);

	disk_update_readahead(disk);

}

EXPORT_SYMBOL(disk_stack_limits);

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ int blk_register_queue(struct gendisk *disk) 
		  "%s is registering an already registered queue\n",

		  kobject_name(&dev->kobj));



	blk_queue_update_readahead(q);

	disk_update_readahead(disk);



	ret = blk_trace_init_sysfs(dev);

	if (ret)

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi 


	if (b) {

		blk_stack_limits(&q->limits, &b->limits, 0);

		blk_queue_update_readahead(q);

		disk_update_readahead(device->vdisk);

	}

	fixup_discard_if_not_supported(q);

	fixup_write_zeroes(device, q);

drivers/md/dm-table.c

+1 −1
Original line number Diff line number Diff line
@@ -2076,7 +2076,7 @@ int dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, 
	}



	dm_update_keyslot_manager(q, t);

	blk_queue_update_readahead(q);

	disk_update_readahead(t->md->disk);



	return 0;

}

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ static int nvme_update_ns_info(struct nvme_ns *ns, struct nvme_id_ns *id) 
		nvme_update_disk_info(ns->head->disk, ns, id);

		blk_stack_limits(&ns->head->disk->queue->limits,

				 &ns->queue->limits, 0);

		blk_queue_update_readahead(ns->head->disk->queue);

		disk_update_readahead(ns->head->disk);

		blk_mq_unfreeze_queue(ns->head->disk->queue);

	}

	return 0;