From: Nikita Danilov Date: Sat, 25 Jun 2005 21:59:20 +0000 (-0700) Subject: [PATCH] ll_merge_requests_fn() cleanup X-Git-Tag: v2.6.13-rc1~68^2~26 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=dfa1a55335a0e822b36607d25c980c4e2a8e5e87;p=~shefty%2Frdma-dev.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index fc86d53fe78..60e64091de1 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, static int ll_merge_requests_fn(request_queue_t *q, struct request *req, struct request *next) { - int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments; - int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; + int total_phys_segments; + int total_hw_segments; /* * 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, return 0; /* - * Will it become to large? + * Will it become too large? */ if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) return 0;