lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ll_merge_requests_fn() cleanup

Browse Source 
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>
This commit is contained in:
Nikita Danilov
2005-06-25 14:59:20 -07:00
committed by Linus Torvalds
parent 672c3fd906
commit dfa1a55335
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/block/ll_rw_blk.c
View File

@@ -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, static int ll_merge_requests_fn(request_queue_t *q, struct request *req,
struct request *next) struct request *next)
{ {
int total_phys_segments = req->nr_phys_segments +next->nr_phys_segments; int total_phys_segments;
int total_hw_segments = req->nr_hw_segments + next->nr_hw_segments; int total_hw_segments;
/* /*
* First check if the either of the requests are re-queued * 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; return 0;
/* /*
* Will it become to large? * Will it become too large?
*/ */
if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) if ((req->nr_sectors + next->nr_sectors) > q->max_sectors)
return 0; return 0;