From f36a248788cde66ad1b76a348b4cacb8d6881fea Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 12 Jun 2009 14:42:56 +0200 Subject: [PATCH] --- yaml --- r: 151088 b: refs/heads/master c: 0989a025d2f4f9f51ea641bd26c563c53dc63f55 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 5 +++++ trunk/block/blk-settings.c | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0f91dcee6c0c..e2d13b3e5d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81be834713a7d6b9463663145d493fe9daee2d61 +refs/heads/master: 0989a025d2f4f9f51ea641bd26c563c53dc63f55 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index f6452f692501..94d88fabc4bd 100644 --- a/trunk/block/blk-core.c +++ b/trunk/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/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index d71cedc09c4e..138610b98956 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/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);