---

yaml --- r: 252255 b: refs/heads/master c: 700c4f3 h: refs/heads/master i: 252253: e816991 252251: cac0a67 252247: bf8ec31 252239: d38048d 252223: 0c94654 v: v3
git-mirror · May 26, 2011 · 6b907d3 · 6b907d3
1 parent 5ebf8de
commit 6b907d3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e3f3ee3c64968d42f4843ec49e579f84b5aa0c
+refs/heads/master: 700c4f3325495d2e0e619fb48b900ec942f1470b
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1130,7 +1130,6 @@ static bool bio_attempt_front_merge(struct request_queue *q,
 				    struct request *req, struct bio *bio)
 {
 	const int ff = bio->bi_rw & REQ_FAILFAST_MASK;
-	sector_t sector;
 
 	if (!ll_front_merge_fn(q, req, bio))
 		return false;
@@ -1140,8 +1139,6 @@ static bool bio_attempt_front_merge(struct request_queue *q,
 	if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff)
 		blk_rq_set_mixed_merge(req);
 
-	sector = bio->bi_sector;
-
 	bio->bi_next = req->bio;
 	req->bio = bio;