Merge branch 'kvm-amd-pmu-fixes' into HEAD

[linux-2.6-microblaze.git] / block / bio.c

diff --git a/block/bio.c b/block/bio.c
index cdd7b29..4259125 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1598,7 +1598,7 @@ EXPORT_SYMBOL(bio_split);
 void bio_trim(struct bio *bio, sector_t offset, sector_t size)
 {
        if (WARN_ON_ONCE(offset > BIO_MAX_SECTORS || size > BIO_MAX_SECTORS ||
-                        offset + size > bio->bi_iter.bi_size))
+                        offset + size > bio_sectors(bio)))
                return;
 
        size <<= 9;