Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/block/bio.c b/block/bio.c
index fa01bef..1f2cc1f 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -608,13 +608,13 @@ void bio_truncate(struct bio *bio, unsigned new_size)
 void guard_bio_eod(struct bio *bio)
 {
        sector_t maxsector;
-       struct hd_struct *part;
+       struct block_device *part;
 
        rcu_read_lock();
        part = __disk_get_part(bio->bi_disk, bio->bi_partno);
        if (part)
-               maxsector = part_nr_sects_read(part);
-       else
+               maxsector = bdev_nr_sectors(part);
+       else    
                maxsector = get_capacity(bio->bi_disk);
        rcu_read_unlock();
 
@@ -1212,8 +1212,8 @@ void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
 
                flush_dcache_page(dst_bv.bv_page);
 
-               bio_advance_iter(src, src_iter, bytes);
-               bio_advance_iter(dst, dst_iter, bytes);
+               bio_advance_iter_single(src, src_iter, bytes);
+               bio_advance_iter_single(dst, dst_iter, bytes);
        }
 }
 EXPORT_SYMBOL(bio_copy_data_iter);