diff options
| author | Andi Kleen <andi@firstfloor.org> | 2010-06-21 11:02:47 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:23:10 +0200 |
| commit | 2c8919dee659928d66cc13333d4e7a5bdd2206d5 (patch) | |
| tree | c60a8c1208cd89b0f5bdb7fc8cdc082b4569f289 /block | |
| parent | block: don't allocate a payload for discard request (diff) | |
| download | linux-2c8919dee659928d66cc13333d4e7a5bdd2206d5.tar.xz linux-2c8919dee659928d66cc13333d4e7a5bdd2206d5.zip | |
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.c | 3 |
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 @@ 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) { /* |