[PATCH] ll_merge_requests_fn() cleanup

ll_merge_requests_fn() assigns total_{phys,hw}_segments twice. Fix this
and a typo.

Signed-off-by: Nikita Danilov <nikita@clusterfs.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Nikita Danilov and committed by Linus Torvalds dfa1a553 672c3fd9

+3 -3
+3 -3
drivers/block/ll_rw_blk.c
··· 1344 1344 static int ll_merge_requests_fn(request_queue_t *q, struct request *req, 1345 1345 struct request *next) 1346 1346 { 1347 - int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments; 1348 - int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; 1347 + int total_phys_segments; 1348 + int total_hw_segments; 1349 1349 1350 1350 /* 1351 1351 * First check if the either of the requests are re-queued ··· 1355 1355 return 0; 1356 1356 1357 1357 /* 1358 - * Will it become to large? 1358 + * Will it become too large? 1359 1359 */ 1360 1360 if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) 1361 1361 return 0;