diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2012-09-18 12:19:26 -0400 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2012-09-20 14:31:41 +0200 |
| commit | f31dc1cd490539e2b62a126bc4dc2495b165d772 (patch) | |
| tree | e8a917161111266f72a7aea539c9562dc2f2653d /block/blk-core.c | |
| parent | block: Clean up special command handling logic (diff) | |
| download | linux-dev-f31dc1cd490539e2b62a126bc4dc2495b165d772.tar.xz linux-dev-f31dc1cd490539e2b62a126bc4dc2495b165d772.zip | |
block: Consolidate command flag and queue limit checks for merges
- blk_check_merge_flags() verifies that cmd_flags / bi_rw are
compatible. This function is called for both req-req and req-bio
merging.
- blk_rq_get_max_sectors() and blk_queue_get_max_sectors() can be used
to query the maximum sector count for a given request or queue. The
calls will return the right value from the queue limits given the
type of command (RW, discard, write same, etc.)
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 5cc29299f6ac..33eded00c5b1 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1866,8 +1866,7 @@ int blk_rq_check_limits(struct request_queue *q, struct request *rq) if (!rq_mergeable(rq)) return 0; - if (blk_rq_sectors(rq) > queue_max_sectors(q) || - blk_rq_bytes(rq) > queue_max_hw_sectors(q) << 9) { + if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, rq->cmd_flags)) { printk(KERN_ERR "%s: over max size limit.\n", __func__); return -EIO; } |