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

[linux-2.6-microblaze.git] / fs / btrfs / reflink.c

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index ae90894..08d0fb4 100644 (file)
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -174,7 +174,7 @@ static int clone_copy_inline_extent(struct inode *dst,
                                    char *inline_data,
                                    struct btrfs_trans_handle **trans_out)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(dst->i_sb);
+       struct btrfs_fs_info *fs_info = inode_to_fs_info(dst);
        struct btrfs_root *root = BTRFS_I(dst)->root;
        const u64 aligned_end = ALIGN(new_key->offset + datal,
                                      fs_info->sectorsize);
@@ -337,7 +337,7 @@ static int btrfs_clone(struct inode *src, struct inode *inode,
                       const u64 off, const u64 olen, const u64 olen_aligned,
                       const u64 destoff, int no_time_update)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
        struct btrfs_path *path = NULL;
        struct extent_buffer *leaf;
        struct btrfs_trans_handle *trans;
@@ -663,7 +663,7 @@ static int btrfs_extent_same_range(struct inode *src, u64 loff, u64 len,
                                   struct inode *dst, u64 dst_loff)
 {
        struct btrfs_fs_info *fs_info = BTRFS_I(src)->root->fs_info;
-       const u64 bs = fs_info->sb->s_blocksize;
+       const u64 bs = fs_info->sectorsize;
        int ret;
 
        /*
@@ -726,11 +726,11 @@ static noinline int btrfs_clone_files(struct file *file, struct file *file_src,
 {
        struct inode *inode = file_inode(file);
        struct inode *src = file_inode(file_src);
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+       struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
        int ret;
        int wb_ret;
        u64 len = olen;
-       u64 bs = fs_info->sb->s_blocksize;
+       u64 bs = fs_info->sectorsize;
 
        /*
         * VFS's generic_remap_file_range_prep() protects us from cloning the
@@ -796,7 +796,7 @@ static int btrfs_remap_file_range_prep(struct file *file_in, loff_t pos_in,
 {
        struct inode *inode_in = file_inode(file_in);
        struct inode *inode_out = file_inode(file_out);
-       u64 bs = BTRFS_I(inode_out)->root->fs_info->sb->s_blocksize;
+       u64 bs = BTRFS_I(inode_out)->root->fs_info->sectorsize;
        u64 wb_len;
        int ret;