summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLuca Tettamanti <kronos.it@gmail.com>2011-05-26 21:07:26 +0200
committerJens Axboe <jaxboe@fusionio.com>2011-05-26 21:07:26 +0200
commit700c4f3325495d2e0e619fb48b900ec942f1470b (patch)
tree649f36acbbf68223908dcb52d881d0ff2fb4b79c /block
parent75e3f3ee3c64968d42f4843ec49e579f84b5aa0c (diff)
downloadlinux-700c4f3325495d2e0e619fb48b900ec942f1470b.tar.gz
linux-700c4f3325495d2e0e619fb48b900ec942f1470b.tar.bz2
linux-700c4f3325495d2e0e619fb48b900ec942f1470b.zip
block: remove unused variable in bio_attempt_front_merge()
sector is never read inside the function. Signed-off-by: Luca Tettamanti <kronos.it@gmail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c3
1 files changed, 0 insertions, 3 deletions
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;