aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-06-21 05:02:47 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 12:23:10 -0400
commit2c8919dee659928d66cc13333d4e7a5bdd2206d5 (patch)
treec60a8c1208cd89b0f5bdb7fc8cdc082b4569f289 /block
parent66ac0280197981f88774e74b60c8e5f9f07c1dba (diff)
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-merge.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 4852475521ea..3b0cd4249671 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -12,7 +12,6 @@
12static unsigned int __blk_recalc_rq_segments(struct request_queue *q, 12static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
13 struct bio *bio) 13 struct bio *bio)
14{ 14{
15 unsigned int phys_size;
16 struct bio_vec *bv, *bvprv = NULL; 15 struct bio_vec *bv, *bvprv = NULL;
17 int cluster, i, high, highprv = 1; 16 int cluster, i, high, highprv = 1;
18 unsigned int seg_size, nr_phys_segs; 17 unsigned int seg_size, nr_phys_segs;
@@ -24,7 +23,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q,
24 fbio = bio; 23 fbio = bio;
25 cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags); 24 cluster = test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags);
26 seg_size = 0; 25 seg_size = 0;
27 phys_size = nr_phys_segs = 0; 26 nr_phys_segs = 0;
28 for_each_bio(bio) { 27 for_each_bio(bio) {
29 bio_for_each_segment(bv, bio, i) { 28 bio_for_each_segment(bv, bio, i) {
30 /* 29 /*