Merge tag 'for-5.16-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[sfrench/cifs-2.6.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b4da58fd0e1a87048e16b811445ac149b6e1076e..fd0ced829edb8288aad16b9222c7d8bd30801a63 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -509,7 +509,7 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder,
        }
 
        if (flush)
-               filemap_write_and_wait((*bdev)->bd_inode->i_mapping);
+               sync_blockdev(*bdev);
        ret = set_blocksize(*bdev, BTRFS_BDEV_BLOCKSIZE);
        if (ret) {
                blkdev_put(*bdev, flags);
@@ -1293,7 +1293,7 @@ static struct btrfs_super_block *btrfs_read_disk_super(struct block_device *bdev
        pgoff_t index;
 
        /* make sure our super fits in the device */
-       if (bytenr + PAGE_SIZE >= i_size_read(bdev->bd_inode))
+       if (bytenr + PAGE_SIZE >= bdev_nr_bytes(bdev))
                return ERR_PTR(-EINVAL);
 
        /* make sure our super fits in the page */
@@ -2659,8 +2659,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
        device->io_width = fs_info->sectorsize;
        device->io_align = fs_info->sectorsize;
        device->sector_size = fs_info->sectorsize;
-       device->total_bytes = round_down(i_size_read(bdev->bd_inode),
-                                        fs_info->sectorsize);
+       device->total_bytes =
+               round_down(bdev_nr_bytes(bdev), fs_info->sectorsize);
        device->disk_total_bytes = device->total_bytes;
        device->commit_total_bytes = device->total_bytes;
        set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);
@@ -7315,7 +7315,7 @@ static int read_one_dev(struct extent_buffer *leaf,
 
        fill_device_from_item(leaf, dev_item, device);
        if (device->bdev) {
-               u64 max_total_bytes = i_size_read(device->bdev->bd_inode);
+               u64 max_total_bytes = bdev_nr_bytes(device->bdev);
 
                if (device->total_bytes > max_total_bytes) {
                        btrfs_err(fs_info,