Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0989a025 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: don't overwrite bdi->state after bdi_init() has been run 



Move the defaults to where we do the init of the backing_dev_info.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 81be8347

block/blk-core.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -498,6 +498,11 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 




	q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug;

	q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug;

	q->backing_dev_info.unplug_io_data = q;

	q->backing_dev_info.unplug_io_data = q;

	q->backing_dev_info.ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;

	q->backing_dev_info.state = 0;

	q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;



	err = bdi_init(&q->backing_dev_info);

	err = bdi_init(&q->backing_dev_info);

	if (err) {

	if (err) {

		kmem_cache_free(blk_requestq_cachep, q);

		kmem_cache_free(blk_requestq_cachep, q);

block/blk-settings.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -129,10 +129,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) 
	blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);

	blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);





	q->make_request_fn = mfn;

	q->make_request_fn = mfn;

	q->backing_dev_info.ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;

	q->backing_dev_info.state = 0;

	q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;

	blk_queue_max_sectors(q, SAFE_MAX_SECTORS);

	blk_queue_max_sectors(q, SAFE_MAX_SECTORS);

	blk_queue_logical_block_size(q, 512);

	blk_queue_logical_block_size(q, 512);

	blk_queue_dma_alignment(q, 511);

	blk_queue_dma_alignment(q, 511);