aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Danilov <nikita@clusterfs.com>2005-06-25 14:59:20 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:25:07 -0700
commitdfa1a55335a0e822b36607d25c980c4e2a8e5e87 (patch)
tree025dd9517b07cc2c52ef5109c3289ed01620323a
parent672c3fd9069e5a138f9d4afc9aeb5aa34aacce32 (diff)
downloadmrst-s0i3-test-dfa1a55335a0e822b36607d25c980c4e2a8e5e87.tar.gz
mrst-s0i3-test-dfa1a55335a0e822b36607d25c980c4e2a8e5e87.tar.xz
mrst-s0i3-test-dfa1a55335a0e822b36607d25c980c4e2a8e5e87.zip
[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>
-rw-r--r--drivers/block/ll_rw_blk.c6
1 files changed, 3 insertions, 3 deletions
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;