X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=d5cd3131c57a36645bcf049e28ab9a46ab5ea559;hb=e4bf063cb8b5e3648aa9917692b185068ab8ba23;hp=4f0ade74cfd04a1c48f22218a6c4369517efa88b;hpb=af788e35bff2b98a413c3e81b13c2a27ef6b7528;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 4f0ade74cfd0..d5cd3131c57a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2270,11 +2270,8 @@ cfq_find_rq_fmerge(struct cfq_data *cfqd, struct bio *bio)
 		return NULL;
 
 	cfqq = cic_to_cfqq(cic, cfq_bio_sync(bio));
-	if (cfqq) {
-		sector_t sector = bio->bi_sector + bio_sectors(bio);
-
-		return elv_rb_find(&cfqq->sort_list, sector);
-	}
+	if (cfqq)
+		return elv_rb_find(&cfqq->sort_list, bio_end_sector(bio));
 
 	return NULL;
 }