Commit 2c8919de authored by Andi Kleen's avatar Andi Kleen Committed by Jens Axboe
Browse files

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



Just some dead code.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 66ac0280

block/blk-merge.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {

			/*