From: Luca Tettamanti Date: Thu, 26 May 2011 19:07:26 +0000 (+0200) Subject: block: remove unused variable in bio_attempt_front_merge() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=700c4f3325495d2e0e619fb48b900ec942f1470b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git block: remove unused variable in bio_attempt_front_merge() sector is never read inside the function. Signed-off-by: Luca Tettamanti Signed-off-by: Jens Axboe --- diff --git a/block/blk-core.c b/block/blk-core.c index c8303e9d919d..dd8ae71168c5 100644 --- a/block/blk-core.c +++ b/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;