diff options
| author |   Keith Busch <keith.busch@intel.com> | 2015-08-19 14:24:05 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@fb.com> | 2015-08-19 14:26:02 -0700 |
| commit | 03100aada96f0645bbcb89aea24c01f02d0ef1fa (patch) | |
| tree | ba909d035a188206b101ae633f925e18d749f7cc /block/bio.c | |
| parent | block: bump BLK_DEF_MAX_SECTORS to 2560 (diff) | |
| download | linux-dev-03100aada96f0645bbcb89aea24c01f02d0ef1fa.tar.xz linux-dev-03100aada96f0645bbcb89aea24c01f02d0ef1fa.zip | |
block: Replace SG_GAPS with new queue limits mask
The SG_GAPS queue flag caused checks for bio vector alignment against
PAGE_SIZE, but the device may have different constraints. This patch
adds a queue limits so a driver with such constraints can set to allow
requests that would have been unnecessarily split. The new gaps check
takes the request_queue as a parameter to simplify the logic around
invoking this function.
This new limit makes the queue flag redundant, so removing it and
all usage. Device-mappers will inherit the correct settings through
blk_stack_limits().
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/bio.c')
| -rw-r--r-- | block/bio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/bio.c b/block/bio.c index 425d6d4a2f7a..b1f198f9a317 100644 --- a/block/bio.c +++ b/block/bio.c @@ -742,8 +742,7 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, struct page * If the queue doesn't support SG gaps and adding this * offset would create a gap, disallow it. */ - if (q->queue_flags & (1 << QUEUE_FLAG_SG_GAPS) && - bvec_gap_to_prev(prev, offset)) + if (bvec_gap_to_prev(q, prev, offset)) return 0; } |