From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 21 Jun 2010 09:02:47 +0000 (+0200)
Subject: gcc-4.6: block: fix unused but set variables in blk-merge
X-Git-Tag: upstream/snapshot3+hdmi~13504^2~116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c8919dee659928d66cc13333d4e7a5bdd2206d5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

gcc-4.6: block: fix unused but set variables in blk-merge

Just some dead code.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 4852475..3b0cd42 100644
--- a/block/blk-merge.c
+++ b/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) {
 			/*