From b9fbe40b3d38605faff7788f49f8c83a1473b551 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 21 Jun 2010 11:02:47 +0200 Subject: [PATCH] --- yaml --- r: 208239 b: refs/heads/master c: 2c8919dee659928d66cc13333d4e7a5bdd2206d5 h: refs/heads/master i: 208237: fc2b6cdfff51051e3e64827f71b11c99600b89f1 208235: a20284b04cce9faacadfee0fadd83416f51cccb6 208231: d11c7bbc04f79830912071c07a6f6d866d9a4e27 208223: 1f543caa6ee62855280fba5961a211bbc99360a7 v: v3 --- [refs] | 2 +- trunk/block/blk-merge.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 28e47b5d8757..63df919796e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66ac0280197981f88774e74b60c8e5f9f07c1dba +refs/heads/master: 2c8919dee659928d66cc13333d4e7a5bdd2206d5 diff --git a/trunk/block/blk-merge.c b/trunk/block/blk-merge.c index 4852475521ea..3b0cd4249671 100644 --- a/trunk/block/blk-merge.c +++ b/trunk/block/blk-merge.c @@ -12,7 +12,6 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, struct bio *bio) { - unsigned int phys_size; struct bio_vec *bv, *bvprv = NULL; int cluster, i, high, highprv = 1; unsigned int seg_size, nr_phys_segs; @@ -24,7 +23,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, fbio = bio; cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags); seg_size = 0; - phys_size = nr_phys_segs = 0; + nr_phys_segs = 0; for_each_bio(bio) { bio_for_each_segment(bv, bio, i) { /*