diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-06-19 09:26:25 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-27 20:13:45 +0200 |
| commit | 0bf6595ec81d896451f0066c95f8cd34c74313dc (patch) | |
| tree | 599046a16eb3b9e045b02f8128dce2c5b917224b /block/blk-core.c | |
| parent | blk-mq: don't bounce by default (diff) | |
| download | linux-0bf6595ec81d896451f0066c95f8cd34c74313dc.tar.xz linux-0bf6595ec81d896451f0066c95f8cd34c74313dc.zip | |
block: don't set bounce limit in blk_init_allocated_queue
And just move it into scsi_transport_sas which needs it due to low-level
drivers directly derferencing bio_data, and into blk_init_queue_node,
which will need a further push into the callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 8699c423fa6e..33b27541dc17 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -960,6 +960,11 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) return NULL; } + /* + * by default assume old behaviour and bounce for any highmem page + */ + blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); + return q; } EXPORT_SYMBOL(blk_init_queue_node); @@ -989,11 +994,6 @@ int blk_init_allocated_queue(struct request_queue *q) */ blk_queue_make_request(q, blk_queue_bio); - /* - * by default assume old behaviour and bounce for any highmem page - */ - blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); - q->sg_reserved_size = INT_MAX; /* Protect q->elevator from elevator_change */ |