From b4876a7a982abbe03bb2c96b33c156c0b03299cb Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 6 Mar 2009 08:48:33 +0100 Subject: [PATCH] --- yaml --- r: 135569 b: refs/heads/master c: f3b144aa7f2861e1024682af3bf3dbf1c29184b9 h: refs/heads/master i: 135567: 8ac1e8216f35b7f929c4bc3c31531b0d05cfcc01 v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 40b0a8dd5cee..809b9ba9ccc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10cbda97e73c7d537d7174eadb2d098484f8f1da +refs/heads/master: f3b144aa7f2861e1024682af3bf3dbf1c29184b9 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 29bcfac6c688..5e14b3f4510f 100644 --- a/trunk/block/blk-core.c +++ b/trunk/block/blk-core.c @@ -603,13 +603,10 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) q->queue_flags = QUEUE_FLAG_DEFAULT; q->queue_lock = lock; - blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK); - + /* + * This also sets hw/phys segments, boundary and size + */ blk_queue_make_request(q, __make_request); - blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE); - - blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS); - blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS); q->sg_reserved_size = INT_MAX;