X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-merge.c;h=fd3fee81c23ce2f1cdc73d2bf4e76188c90358cb;hb=85a3685852d9ac7d92be9d824533c915a4597fa4;hp=fc1ff3b1ea1f4a9ea2dcd18d6e49eea7281eb9b3;hpb=d582cb792647dfc82345e53cff15b6ab87e2540f;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index fc1ff3b1ea1f..fd3fee81c23c 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -592,7 +592,7 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)
 	if (q->queue_flags & (1 << QUEUE_FLAG_SG_GAPS)) {
 		struct bio_vec *bprev;
 
-		bprev = &rq->biotail->bi_io_vec[bio->bi_vcnt - 1];
+		bprev = &rq->biotail->bi_io_vec[rq->biotail->bi_vcnt - 1];
 		if (bvec_gap_to_prev(bprev, bio->bi_io_vec[0].bv_offset))
 			return false;
 	}