aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 904eae10ec65..a0e818cb0401 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -7009,8 +7009,8 @@ static noinline int get_new_locations(struct inode *reloc_inode,
7009 7009
7010 cur_pos = extent_key->objectid - offset; 7010 cur_pos = extent_key->objectid - offset;
7011 last_byte = extent_key->objectid + extent_key->offset; 7011 last_byte = extent_key->objectid + extent_key->offset;
7012 ret = btrfs_lookup_file_extent(NULL, root, path, reloc_inode->i_ino, 7012 ret = btrfs_lookup_file_extent(NULL, root, path,
7013 cur_pos, 0); 7013 btrfs_ino(reloc_inode), cur_pos, 0);
7014 if (ret < 0) 7014 if (ret < 0)
7015 goto out; 7015 goto out;
7016 if (ret > 0) { 7016 if (ret > 0) {
@@ -7033,7 +7033,7 @@ static noinline int get_new_locations(struct inode *reloc_inode,
7033 btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]); 7033 btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
7034 if (found_key.offset != cur_pos || 7034 if (found_key.offset != cur_pos ||
7035 found_key.type != BTRFS_EXTENT_DATA_KEY || 7035 found_key.type != BTRFS_EXTENT_DATA_KEY ||
7036 found_key.objectid != reloc_inode->i_ino) 7036 found_key.objectid != btrfs_ino(reloc_inode))
7037 break; 7037 break;
7038 7038
7039 fi = btrfs_item_ptr(leaf, path->slots[0], 7039 fi = btrfs_item_ptr(leaf, path->slots[0],
@@ -7179,7 +7179,7 @@ next:
7179 break; 7179 break;
7180 } 7180 }
7181 7181
7182 if (inode && key.objectid != inode->i_ino) { 7182 if (inode && key.objectid != btrfs_ino(inode)) {
7183 BUG_ON(extent_locked); 7183 BUG_ON(extent_locked);
7184 btrfs_release_path(root, path); 7184 btrfs_release_path(root, path);
7185 mutex_unlock(&inode->i_mutex); 7185 mutex_unlock(&inode->i_mutex);
@@ -7488,7 +7488,7 @@ static noinline int invalidate_extent_cache(struct btrfs_root *root,
7488 continue; 7488 continue;
7489 if (btrfs_file_extent_disk_bytenr(leaf, fi) == 0) 7489 if (btrfs_file_extent_disk_bytenr(leaf, fi) == 0)
7490 continue; 7490 continue;
7491 if (!inode || inode->i_ino != key.objectid) { 7491 if (!inode || btrfs_ino(inode) != key.objectid) {
7492 iput(inode); 7492 iput(inode);
7493 inode = btrfs_ilookup(target_root->fs_info->sb, 7493 inode = btrfs_ilookup(target_root->fs_info->sb,
7494 key.objectid, target_root, 1); 7494 key.objectid, target_root, 1);