diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-06-12 14:42:56 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-06-16 08:21:03 +0200 |
| commit | 0989a025d2f4f9f51ea641bd26c563c53dc63f55 (patch) | |
| tree | 5b4f29d3b1a3d09d3052e0c18d63dba8a946da86 /block | |
| parent | 81be834713a7d6b9463663145d493fe9daee2d61 (diff) | |
| download | linux-3.10-0989a025d2f4f9f51ea641bd26c563c53dc63f55.tar.gz linux-3.10-0989a025d2f4f9f51ea641bd26c563c53dc63f55.tar.bz2 linux-3.10-0989a025d2f4f9f51ea641bd26c563c53dc63f55.zip | |
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: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 5 | ||||
| -rw-r--r-- | block/blk-settings.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index f6452f69250..94d88fabc4b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -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_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); if (err) { kmem_cache_free(blk_requestq_cachep, q); diff --git a/block/blk-settings.c b/block/blk-settings.c index d71cedc09c4..138610b9895 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -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); 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_logical_block_size(q, 512); blk_queue_dma_alignment(q, 511); |