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>
This commit is contained in:
parent
19df27a9e4
commit
9cdc512410
|
@ -3081,7 +3081,7 @@ int btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
|
||||||
u64 file_start, int contig);
|
u64 file_start, int contig);
|
||||||
int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
|
int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,
|
||||||
struct list_head *list, int search_commit);
|
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,
|
const struct btrfs_path *path,
|
||||||
struct btrfs_file_extent_item *fi,
|
struct btrfs_file_extent_item *fi,
|
||||||
const bool new_inline,
|
const bool new_inline,
|
||||||
|
|
|
@ -904,14 +904,14 @@ fail_unlock:
|
||||||
goto out;
|
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,
|
const struct btrfs_path *path,
|
||||||
struct btrfs_file_extent_item *fi,
|
struct btrfs_file_extent_item *fi,
|
||||||
const bool new_inline,
|
const bool new_inline,
|
||||||
struct extent_map *em)
|
struct extent_map *em)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
|
struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
|
||||||
struct btrfs_root *root = BTRFS_I(inode)->root;
|
struct btrfs_root *root = inode->root;
|
||||||
struct extent_buffer *leaf = path->nodes[0];
|
struct extent_buffer *leaf = path->nodes[0];
|
||||||
const int slot = path->slots[0];
|
const int slot = path->slots[0];
|
||||||
struct btrfs_key key;
|
struct btrfs_key key;
|
||||||
|
@ -976,8 +976,8 @@ void btrfs_extent_item_to_extent_map(struct inode *inode,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
btrfs_err(fs_info,
|
btrfs_err(fs_info,
|
||||||
"unknown file extent item type %d, inode %llu, offset %llu, root %llu",
|
"unknown file extent item type %d, inode %llu, offset %llu, "
|
||||||
type, btrfs_ino(BTRFS_I(inode)), extent_start,
|
"root %llu", type, btrfs_ino(inode), extent_start,
|
||||||
root->root_key.objectid);
|
root->root_key.objectid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6862,7 +6862,8 @@ next:
|
||||||
goto not_found_em;
|
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 ||
|
if (found_type == BTRFS_FILE_EXTENT_REG ||
|
||||||
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
found_type == BTRFS_FILE_EXTENT_PREALLOC) {
|
||||||
|
|
|
@ -3333,7 +3333,8 @@ static void clone_update_extent_map(struct inode *inode,
|
||||||
|
|
||||||
fi = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
fi = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
||||||
struct btrfs_file_extent_item);
|
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;
|
em->generation = -1;
|
||||||
if (btrfs_file_extent_type(path->nodes[0], fi) ==
|
if (btrfs_file_extent_type(path->nodes[0], fi) ==
|
||||||
BTRFS_FILE_EXTENT_INLINE)
|
BTRFS_FILE_EXTENT_INLINE)
|
||||||
|
|
Loading…
Reference in a new issue