From 6b907d3a187ae8848c77f7935ed560f051948886 Mon Sep 17 00:00:00 2001 From: Luca Tettamanti Date: Thu, 26 May 2011 21:07:26 +0200 Subject: [PATCH] --- yaml --- r: 252255 b: refs/heads/master c: 700c4f3325495d2e0e619fb48b900ec942f1470b h: refs/heads/master i: 252253: e8169910658686ab4acddc4e841f6fcafba6fbc7 252251: cac0a67a2b6cc6f39f31d49a45c0dddb73efd787 252247: bf8ec318dcc95c4f416810902043660823afa019 252239: d38048ded5f4f37e658eb6e05aa73d349a468cbe 252223: 0c946544cb6bd2d6a3cb3bc7f865eca1936df4cb v: v3 --- [refs] | 2 +- trunk/block/blk-core.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 86f61d330db6..a514018d9598 100644 --- 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 index c8303e9d919d..dd8ae71168c5 100644 --- 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;