---

yaml --- r: 208239 b: refs/heads/master c: 2c8919d h: refs/heads/master i: 208237: fc2b6cd 208235: a20284b 208231: d11c7bb 208223: 1f543ca v: v3
git-mirror · Aug 7, 2010 · b9fbe40 · b9fbe40
1 parent d706a9f
commit b9fbe40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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) {
 			/*