Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 700c4f33 authored by Luca Tettamanti's avatar Luca Tettamanti Committed by Jens Axboe
Browse files

block: remove unused variable in bio_attempt_front_merge() 



sector is never read inside the function.

Signed-off-by: default avatarLuca Tettamanti <kronos.it@gmail.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 75e3f3ee

block/blk-core.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1130,7 +1130,6 @@ static bool bio_attempt_front_merge(struct request_queue *q, 
				    struct request *req, struct bio *bio)

				    struct request *req, struct bio *bio)

{

{

	const int ff = bio->bi_rw & REQ_FAILFAST_MASK;

	const int ff = bio->bi_rw & REQ_FAILFAST_MASK;

	sector_t sector;





	if (!ll_front_merge_fn(q, req, bio))

	if (!ll_front_merge_fn(q, req, bio))

		return false;

		return false;
@@ -1140,8 +1139,6 @@ static bool bio_attempt_front_merge(struct request_queue *q, 
	if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff)

	if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff)

		blk_rq_set_mixed_merge(req);

		blk_rq_set_mixed_merge(req);





	sector = bio->bi_sector;



	bio->bi_next = req->bio;

	bio->bi_next = req->bio;

	req->bio = bio;

	req->bio = bio;