Commit 35339c24 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Make hole_mergeable take btrfs_inode

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent dcdbc059
...@@ -2195,7 +2195,7 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma) ...@@ -2195,7 +2195,7 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)
return 0; return 0;
} }
static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf, static int hole_mergeable(struct btrfs_inode *inode, struct extent_buffer *leaf,
int slot, u64 start, u64 end) int slot, u64 start, u64 end)
{ {
struct btrfs_file_extent_item *fi; struct btrfs_file_extent_item *fi;
...@@ -2205,7 +2205,7 @@ static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf, ...@@ -2205,7 +2205,7 @@ static int hole_mergeable(struct inode *inode, struct extent_buffer *leaf,
return 0; return 0;
btrfs_item_key_to_cpu(leaf, &key, slot); btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.objectid != btrfs_ino(BTRFS_I(inode)) || if (key.objectid != btrfs_ino(inode) ||
key.type != BTRFS_EXTENT_DATA_KEY) key.type != BTRFS_EXTENT_DATA_KEY)
return 0; return 0;
...@@ -2255,7 +2255,8 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode, ...@@ -2255,7 +2255,8 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
} }
leaf = path->nodes[0]; leaf = path->nodes[0];
if (hole_mergeable(inode, leaf, path->slots[0]-1, offset, end)) { if (hole_mergeable(BTRFS_I(inode), leaf, path->slots[0] - 1,
offset, end)) {
u64 num_bytes; u64 num_bytes;
path->slots[0]--; path->slots[0]--;
...@@ -2270,7 +2271,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode, ...@@ -2270,7 +2271,7 @@ static int fill_holes(struct btrfs_trans_handle *trans, struct inode *inode,
goto out; goto out;
} }
if (hole_mergeable(inode, leaf, path->slots[0], offset, end)) { if (hole_mergeable(BTRFS_I(inode), leaf, path->slots[0], offset, end)) {
u64 num_bytes; u64 num_bytes;
key.offset = offset; key.offset = offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment