diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/ll_rw_blk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index fc86d53fe783..60e64091de1b 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c | |||
@@ -1344,8 +1344,8 @@ static int ll_front_merge_fn(request_queue_t *q, struct request *req, | |||
1344 | static int ll_merge_requests_fn(request_queue_t *q, struct request *req, | 1344 | static int ll_merge_requests_fn(request_queue_t *q, struct request *req, |
1345 | struct request *next) | 1345 | struct request *next) |
1346 | { | 1346 | { |
1347 | int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments; | 1347 | int total_phys_segments; |
1348 | int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; | 1348 | int total_hw_segments; |
1349 | 1349 | ||
1350 | /* | 1350 | /* |
1351 | * First check if the either of the requests are re-queued | 1351 | * First check if the either of the requests are re-queued |
@@ -1355,7 +1355,7 @@ static int ll_merge_requests_fn(request_queue_t *q, struct request *req, | |||
1355 | return 0; | 1355 | return 0; |
1356 | 1356 | ||
1357 | /* | 1357 | /* |
1358 | * Will it become to large? | 1358 | * Will it become too large? |
1359 | */ | 1359 | */ |
1360 | if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) | 1360 | if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) |
1361 | return 0; | 1361 | return 0; |