X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fbtrfs%2Fextent_io.c;h=e7e7afb4a87268211e8b0ef881a6eeac0068eefd;hb=130901ba33c4a040e12cf7cce240c1056cc096ee;hp=b306b3a88fc7512248aa5a29e93ec57a2fca1d0f;hpb=c5cb6a0573bef87e098ee3cd946115ebe60a910e;p=karo-tx-linux.git

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index b306b3a88fc7..e7e7afb4a872 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2643,8 +2643,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
 		if (old_compressed)
 			contig = bio->bi_sector == sector;
 		else
-			contig = bio->bi_sector + (bio->bi_size >> 9) ==
-				sector;
+			contig = bio_end_sector(bio) == sector;
 
 		if (prev_bio_flags != bio_flags || !contig ||
 		    merge_bio(rw, tree, page, offset, page_size, bio, bio_flags) ||