diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:32:15 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | 8fe0d473f5477e9916d3ac581a226acfe83142be (patch) | |
| tree | a433795d1ad57cd0b2fdf64e6d3b7ae579abfd78 /block/blk-core.c | |
| parent | 63a4cc24867de73626e16767ce616c50dc5438d3 (diff) | |
| download | linux-0-day-8fe0d473f5477e9916d3ac581a226acfe83142be.tar.gz linux-0-day-8fe0d473f5477e9916d3ac581a226acfe83142be.tar.xz | |
block: convert merge/insert code to check for REQ_OPs.
This patch converts the block layer merging code to use separate variables
for the operation and flags, and to check req_op for the REQ_OP.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 090e55d7cad70..1333bb764b288 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2161,7 +2161,7 @@ EXPORT_SYMBOL(submit_bio); static int blk_cloned_rq_check_limits(struct request_queue *q, struct request *rq) { - if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, rq->cmd_flags)) { + if (blk_rq_sectors(rq) > blk_queue_get_max_sectors(q, req_op(rq))) { printk(KERN_ERR "%s: over max size limit.\n", __func__); return -EIO; } |