diff options
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 5e7dc9973458..87e4fb7d0e98 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
| @@ -226,7 +226,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req, | |||
| 226 | { | 226 | { |
| 227 | unsigned short max_sectors; | 227 | unsigned short max_sectors; |
| 228 | 228 | ||
| 229 | if (unlikely(blk_pc_request(req))) | 229 | if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC)) |
| 230 | max_sectors = queue_max_hw_sectors(q); | 230 | max_sectors = queue_max_hw_sectors(q); |
| 231 | else | 231 | else |
| 232 | max_sectors = queue_max_sectors(q); | 232 | max_sectors = queue_max_sectors(q); |
| @@ -250,7 +250,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req, | |||
| 250 | { | 250 | { |
| 251 | unsigned short max_sectors; | 251 | unsigned short max_sectors; |
| 252 | 252 | ||
| 253 | if (unlikely(blk_pc_request(req))) | 253 | if (unlikely(req->cmd_type == REQ_TYPE_BLOCK_PC)) |
| 254 | max_sectors = queue_max_hw_sectors(q); | 254 | max_sectors = queue_max_hw_sectors(q); |
| 255 | else | 255 | else |
| 256 | max_sectors = queue_max_sectors(q); | 256 | max_sectors = queue_max_sectors(q); |