btrfs: Make btrfs_extent_item_to_extent_map take btrfs_inode

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index af68f8452f196f9698cc5a6244b30da60c5f1a82..2e0845eafcbc192cfa89deec4284decff4390357 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3081,7 +3081,7 @@ int btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
                       u64 file_start, int contig);
 int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
                             struct list_head *list, int search_commit);
-void btrfs_extent_item_to_extent_map(struct inode *inode,
+void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
                                     const struct btrfs_path *path,
                                     struct btrfs_file_extent_item *fi,
                                     const bool new_inline,

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index a8a0dd21708489e0b8379ea3d51702292c140c89..54ec6d6ef0163fb51aa9ae242a423e8dd3d51474 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -904,14 +904,14 @@ fail_unlock:
        goto out;
 }
 
-void btrfs_extent_item_to_extent_map(struct inode *inode,
+void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode,
                                     const struct btrfs_path *path,
                                     struct btrfs_file_extent_item *fi,
                                     const bool new_inline,
                                     struct extent_map *em)
 {
-       struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
-       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
+       struct btrfs_root *root = inode->root;
        struct extent_buffer *leaf = path->nodes[0];
        const int slot = path->slots[0];
        struct btrfs_key key;
@@ -976,8 +976,8 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
                }
        } else {
                btrfs_err(fs_info,
-                         "unknown file extent item type %d, inode %llu, offset %llu, root %llu",
-                         type, btrfs_ino(BTRFS_I(inode)), extent_start,
+                         "unknown file extent item type %d, inode %llu, offset %llu, "
+                         "root %llu", type, btrfs_ino(inode), extent_start,
                          root->root_key.objectid);
        }
 }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d5339b8d46637f5e1c0a34978215dd9996bc6d50..0b46542010fb15eeb4953a77702768f8104b5020 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6862,7 +6862,8 @@ next:
                goto not_found_em;
        }
 
-       btrfs_extent_item_to_extent_map(inode, path, item, new_inline, em);
+       btrfs_extent_item_to_extent_map(BTRFS_I(inode), path, item,
+                       new_inline, em);
 
        if (found_type == BTRFS_FILE_EXTENT_REG ||
            found_type == BTRFS_FILE_EXTENT_PREALLOC) {

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index bc2e03a2569e777a2e41e6bfe2a90aefaa8558fb..bb4e6ec26b7f1d5d2bba43736a7fd5640606a40e 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3333,7 +3333,8 @@ static void clone_update_extent_map(struct inode *inode,
 
                fi = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                    struct btrfs_file_extent_item);
-               btrfs_extent_item_to_extent_map(inode, path, fi, false, em);
+               btrfs_extent_item_to_extent_map(BTRFS_I(inode), path, fi,
+                               false, em);
                em->generation = -1;
                if (btrfs_file_extent_type(path->nodes[0], fi) ==
                    BTRFS_FILE_EXTENT_INLINE)