block: replace bi_bdev with a gendisk pointer and partitions index

[mirror_ubuntu-bionic-kernel.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 87c1f4150c645c83c64cd7f90243d347121f8886..a791aac4c5af154051becb0b183c448acaf96c2d 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -142,7 +142,7 @@ struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
                }
        }
        if (bio) {
-               bio->bi_bdev = bdev;
+               bio_set_dev(bio, bdev);
                bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(blk_addr);
        }
        return bdev;
@@ -161,7 +161,8 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)
 static bool __same_bdev(struct f2fs_sb_info *sbi,
                                block_t blk_addr, struct bio *bio)
 {
-       return f2fs_target_device(sbi, blk_addr, NULL) == bio->bi_bdev;
+       struct block_device *b = f2fs_target_device(sbi, blk_addr, NULL);
+       return bio->bi_disk == b->bd_disk && bio->bi_partno == b->bd_partno;
 }
 
 /*