diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 3 |
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, | |||
1130 | struct request *req, struct bio *bio) | 1130 | struct request *req, struct bio *bio) |
1131 | { | 1131 | { |
1132 | const int ff = bio->bi_rw & REQ_FAILFAST_MASK; | 1132 | const int ff = bio->bi_rw & REQ_FAILFAST_MASK; |
1133 | sector_t sector; | ||
1134 | 1133 | ||
1135 | if (!ll_front_merge_fn(q, req, bio)) | 1134 | if (!ll_front_merge_fn(q, req, bio)) |
1136 | return false; | 1135 | return false; |
@@ -1140,8 +1139,6 @@ static bool bio_attempt_front_merge(struct request_queue *q, | |||
1140 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) | 1139 | if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) |
1141 | blk_rq_set_mixed_merge(req); | 1140 | blk_rq_set_mixed_merge(req); |
1142 | 1141 | ||
1143 | sector = bio->bi_sector; | ||
1144 | |||
1145 | bio->bi_next = req->bio; | 1142 | bio->bi_next = req->bio; |
1146 | req->bio = bio; | 1143 | req->bio = bio; |
1147 | 1144 | ||