Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: drop unused parameter from btrfs_release_path

parameter tree root it's not used since commit
5f39d397dfbe140a14edecd4e73c34ce23c4f9ee ("Btrfs: Create extent_buffer
interface for large blocksizes")

Signed-off-by: David Sterba <dsterba@suse.cz>

+160 -160
+14 -14
fs/btrfs/ctree.c
··· 107 107 { 108 108 if (!p) 109 109 return; 110 - btrfs_release_path(NULL, p); 110 + btrfs_release_path(p); 111 111 kmem_cache_free(btrfs_path_cachep, p); 112 112 } 113 113 ··· 117 117 * 118 118 * It is safe to call this on paths that no locks or extent buffers held. 119 119 */ 120 - noinline void btrfs_release_path(struct btrfs_root *root, struct btrfs_path *p) 120 + noinline void btrfs_release_path(struct btrfs_path *p) 121 121 { 122 122 int i; 123 123 ··· 1328 1328 ret = -EAGAIN; 1329 1329 1330 1330 /* release the whole path */ 1331 - btrfs_release_path(root, path); 1331 + btrfs_release_path(path); 1332 1332 1333 1333 /* read the blocks */ 1334 1334 if (block1) ··· 1475 1475 return 0; 1476 1476 } 1477 1477 free_extent_buffer(tmp); 1478 - btrfs_release_path(NULL, p); 1478 + btrfs_release_path(p); 1479 1479 return -EIO; 1480 1480 } 1481 1481 } ··· 1494 1494 if (p->reada) 1495 1495 reada_for_search(root, p, level, slot, key->objectid); 1496 1496 1497 - btrfs_release_path(NULL, p); 1497 + btrfs_release_path(p); 1498 1498 1499 1499 ret = -EAGAIN; 1500 1500 tmp = read_tree_block(root, blocknr, blocksize, 0); ··· 1563 1563 } 1564 1564 b = p->nodes[level]; 1565 1565 if (!b) { 1566 - btrfs_release_path(NULL, p); 1566 + btrfs_release_path(p); 1567 1567 goto again; 1568 1568 } 1569 1569 BUG_ON(btrfs_header_nritems(b) == 1); ··· 1753 1753 if (!p->leave_spinning) 1754 1754 btrfs_set_path_blocking(p); 1755 1755 if (ret < 0) 1756 - btrfs_release_path(root, p); 1756 + btrfs_release_path(p); 1757 1757 return ret; 1758 1758 } 1759 1759 ··· 3026 3026 struct btrfs_file_extent_item); 3027 3027 extent_len = btrfs_file_extent_num_bytes(leaf, fi); 3028 3028 } 3029 - btrfs_release_path(root, path); 3029 + btrfs_release_path(path); 3030 3030 3031 3031 path->keep_locks = 1; 3032 3032 path->search_for_split = 1; ··· 3948 3948 else 3949 3949 return 1; 3950 3950 3951 - btrfs_release_path(root, path); 3951 + btrfs_release_path(path); 3952 3952 ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); 3953 3953 if (ret < 0) 3954 3954 return ret; ··· 4072 4072 sret = btrfs_find_next_key(root, path, min_key, level, 4073 4073 cache_only, min_trans); 4074 4074 if (sret == 0) { 4075 - btrfs_release_path(root, path); 4075 + btrfs_release_path(path); 4076 4076 goto again; 4077 4077 } else { 4078 4078 goto out; ··· 4151 4151 btrfs_node_key_to_cpu(c, &cur_key, slot); 4152 4152 4153 4153 orig_lowest = path->lowest_level; 4154 - btrfs_release_path(root, path); 4154 + btrfs_release_path(path); 4155 4155 path->lowest_level = level; 4156 4156 ret = btrfs_search_slot(NULL, root, &cur_key, path, 4157 4157 0, 0); ··· 4228 4228 again: 4229 4229 level = 1; 4230 4230 next = NULL; 4231 - btrfs_release_path(root, path); 4231 + btrfs_release_path(path); 4232 4232 4233 4233 path->keep_locks = 1; 4234 4234 ··· 4284 4284 goto again; 4285 4285 4286 4286 if (ret < 0) { 4287 - btrfs_release_path(root, path); 4287 + btrfs_release_path(path); 4288 4288 goto done; 4289 4289 } 4290 4290 ··· 4323 4323 goto again; 4324 4324 4325 4325 if (ret < 0) { 4326 - btrfs_release_path(root, path); 4326 + btrfs_release_path(path); 4327 4327 goto done; 4328 4328 } 4329 4329
+1 -1
fs/btrfs/ctree.h
··· 2290 2290 struct btrfs_root *root, struct extent_buffer *parent, 2291 2291 int start_slot, int cache_only, u64 *last_ret, 2292 2292 struct btrfs_key *progress); 2293 - void btrfs_release_path(struct btrfs_root *root, struct btrfs_path *p); 2293 + void btrfs_release_path(struct btrfs_path *p); 2294 2294 struct btrfs_path *btrfs_alloc_path(void); 2295 2295 void btrfs_free_path(struct btrfs_path *p); 2296 2296 void btrfs_set_path_blocking(struct btrfs_path *p);
+1 -1
fs/btrfs/dir-item.c
··· 172 172 ret = 0; 173 173 goto out_free; 174 174 } 175 - btrfs_release_path(root, path); 175 + btrfs_release_path(path); 176 176 177 177 btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY); 178 178 key.offset = index;
+22 -22
fs/btrfs/extent-tree.c
··· 379 379 break; 380 380 381 381 caching_ctl->progress = last; 382 - btrfs_release_path(extent_root, path); 382 + btrfs_release_path(path); 383 383 up_read(&fs_info->extent_commit_sem); 384 384 mutex_unlock(&caching_ctl->mutex); 385 385 if (btrfs_transaction_in_commit(fs_info)) ··· 754 754 atomic_inc(&head->node.refs); 755 755 spin_unlock(&delayed_refs->lock); 756 756 757 - btrfs_release_path(root->fs_info->extent_root, path); 757 + btrfs_release_path(path); 758 758 759 759 mutex_lock(&head->mutex); 760 760 mutex_unlock(&head->mutex); ··· 934 934 break; 935 935 } 936 936 } 937 - btrfs_release_path(root, path); 937 + btrfs_release_path(path); 938 938 939 939 if (owner < BTRFS_FIRST_FREE_OBJECTID) 940 940 new_size += sizeof(*bi); ··· 1042 1042 return 0; 1043 1043 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0 1044 1044 key.type = BTRFS_EXTENT_REF_V0_KEY; 1045 - btrfs_release_path(root, path); 1045 + btrfs_release_path(path); 1046 1046 ret = btrfs_search_slot(trans, root, &key, path, -1, 1); 1047 1047 if (ret < 0) { 1048 1048 err = ret; ··· 1080 1080 if (match_extent_data_ref(leaf, ref, root_objectid, 1081 1081 owner, offset)) { 1082 1082 if (recow) { 1083 - btrfs_release_path(root, path); 1083 + btrfs_release_path(path); 1084 1084 goto again; 1085 1085 } 1086 1086 err = 0; ··· 1141 1141 if (match_extent_data_ref(leaf, ref, root_objectid, 1142 1142 owner, offset)) 1143 1143 break; 1144 - btrfs_release_path(root, path); 1144 + btrfs_release_path(path); 1145 1145 key.offset++; 1146 1146 ret = btrfs_insert_empty_item(trans, root, path, &key, 1147 1147 size); ··· 1167 1167 btrfs_mark_buffer_dirty(leaf); 1168 1168 ret = 0; 1169 1169 fail: 1170 - btrfs_release_path(root, path); 1170 + btrfs_release_path(path); 1171 1171 return ret; 1172 1172 } 1173 1173 ··· 1293 1293 ret = -ENOENT; 1294 1294 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0 1295 1295 if (ret == -ENOENT && parent) { 1296 - btrfs_release_path(root, path); 1296 + btrfs_release_path(path); 1297 1297 key.type = BTRFS_EXTENT_REF_V0_KEY; 1298 1298 ret = btrfs_search_slot(trans, root, &key, path, -1, 1); 1299 1299 if (ret > 0) ··· 1322 1322 } 1323 1323 1324 1324 ret = btrfs_insert_empty_item(trans, root, path, &key, 0); 1325 - btrfs_release_path(root, path); 1325 + btrfs_release_path(path); 1326 1326 return ret; 1327 1327 } 1328 1328 ··· 1608 1608 if (ret != -ENOENT) 1609 1609 return ret; 1610 1610 1611 - btrfs_release_path(root, path); 1611 + btrfs_release_path(path); 1612 1612 *ref_ret = NULL; 1613 1613 1614 1614 if (owner < BTRFS_FIRST_FREE_OBJECTID) { ··· 1862 1862 __run_delayed_extent_op(extent_op, leaf, item); 1863 1863 1864 1864 btrfs_mark_buffer_dirty(leaf); 1865 - btrfs_release_path(root->fs_info->extent_root, path); 1865 + btrfs_release_path(path); 1866 1866 1867 1867 path->reada = 1; 1868 1868 path->leave_spinning = 1; ··· 2361 2361 atomic_inc(&head->node.refs); 2362 2362 spin_unlock(&delayed_refs->lock); 2363 2363 2364 - btrfs_release_path(root->fs_info->extent_root, path); 2364 + btrfs_release_path(path); 2365 2365 2366 2366 mutex_lock(&head->mutex); 2367 2367 mutex_unlock(&head->mutex); ··· 2732 2732 bi = btrfs_item_ptr_offset(leaf, path->slots[0]); 2733 2733 write_extent_buffer(leaf, &cache->item, bi, sizeof(cache->item)); 2734 2734 btrfs_mark_buffer_dirty(leaf); 2735 - btrfs_release_path(extent_root, path); 2735 + btrfs_release_path(path); 2736 2736 fail: 2737 2737 if (ret) 2738 2738 return ret; ··· 2785 2785 inode = lookup_free_space_inode(root, block_group, path); 2786 2786 if (IS_ERR(inode) && PTR_ERR(inode) != -ENOENT) { 2787 2787 ret = PTR_ERR(inode); 2788 - btrfs_release_path(root, path); 2788 + btrfs_release_path(path); 2789 2789 goto out; 2790 2790 } 2791 2791 ··· 2854 2854 out_put: 2855 2855 iput(inode); 2856 2856 out_free: 2857 - btrfs_release_path(root, path); 2857 + btrfs_release_path(path); 2858 2858 out: 2859 2859 spin_lock(&block_group->lock); 2860 2860 block_group->disk_cache_state = dcs; ··· 4541 4541 NULL, refs_to_drop, 4542 4542 is_data); 4543 4543 BUG_ON(ret); 4544 - btrfs_release_path(extent_root, path); 4544 + btrfs_release_path(path); 4545 4545 path->leave_spinning = 1; 4546 4546 4547 4547 key.objectid = bytenr; ··· 4580 4580 owner_objectid, 0); 4581 4581 BUG_ON(ret < 0); 4582 4582 4583 - btrfs_release_path(extent_root, path); 4583 + btrfs_release_path(path); 4584 4584 path->leave_spinning = 1; 4585 4585 4586 4586 key.objectid = bytenr; ··· 4650 4650 ret = btrfs_del_items(trans, extent_root, path, path->slots[0], 4651 4651 num_to_del); 4652 4652 BUG_ON(ret); 4653 - btrfs_release_path(extent_root, path); 4653 + btrfs_release_path(path); 4654 4654 4655 4655 if (is_data) { 4656 4656 ret = btrfs_del_csums(trans, root, bytenr, num_bytes); ··· 6480 6480 trans->block_rsv = block_rsv; 6481 6481 } 6482 6482 } 6483 - btrfs_release_path(root, path); 6483 + btrfs_release_path(path); 6484 6484 BUG_ON(err); 6485 6485 6486 6486 ret = btrfs_del_root(trans, tree_root, &root->root_key); ··· 8580 8580 memcpy(&cache->key, &found_key, sizeof(found_key)); 8581 8581 8582 8582 key.objectid = found_key.objectid + found_key.offset; 8583 - btrfs_release_path(root, path); 8583 + btrfs_release_path(path); 8584 8584 cache->flags = btrfs_block_group_flags(&cache->item); 8585 8585 cache->sectorsize = root->sectorsize; 8586 8586 ··· 8802 8802 if (ret < 0) 8803 8803 goto out; 8804 8804 if (ret > 0) 8805 - btrfs_release_path(tree_root, path); 8805 + btrfs_release_path(path); 8806 8806 if (ret == 0) { 8807 8807 ret = btrfs_del_item(trans, tree_root, path); 8808 8808 if (ret) 8809 8809 goto out; 8810 - btrfs_release_path(tree_root, path); 8810 + btrfs_release_path(path); 8811 8811 } 8812 8812 8813 8813 spin_lock(&root->fs_info->block_group_cache_lock);
+6 -6
fs/btrfs/file-item.c
··· 193 193 u32 item_size; 194 194 195 195 if (item) 196 - btrfs_release_path(root, path); 196 + btrfs_release_path(path); 197 197 item = btrfs_lookup_csum(NULL, root->fs_info->csum_root, 198 198 path, disk_bytenr, 0); 199 199 if (IS_ERR(item)) { ··· 213 213 (unsigned long long)offset); 214 214 } 215 215 item = NULL; 216 - btrfs_release_path(root, path); 216 + btrfs_release_path(path); 217 217 goto found; 218 218 } 219 219 btrfs_item_key_to_cpu(path->nodes[0], &found_key, ··· 631 631 if (key.offset < bytenr) 632 632 break; 633 633 } 634 - btrfs_release_path(root, path); 634 + btrfs_release_path(path); 635 635 } 636 636 out: 637 637 btrfs_free_path(path); ··· 722 722 * at this point, we know the tree has an item, but it isn't big 723 723 * enough yet to put our csum in. Grow it 724 724 */ 725 - btrfs_release_path(root, path); 725 + btrfs_release_path(path); 726 726 ret = btrfs_search_slot(trans, root, &file_key, path, 727 727 csum_size, 1); 728 728 if (ret < 0) ··· 766 766 } 767 767 768 768 insert: 769 - btrfs_release_path(root, path); 769 + btrfs_release_path(path); 770 770 csum_offset = 0; 771 771 if (found_next) { 772 772 u64 tmp = total_bytes + root->sectorsize; ··· 850 850 } 851 851 btrfs_mark_buffer_dirty(path->nodes[0]); 852 852 if (total_bytes < sums->len) { 853 - btrfs_release_path(root, path); 853 + btrfs_release_path(path); 854 854 cond_resched(); 855 855 goto again; 856 856 }
+6 -6
fs/btrfs/file.c
··· 376 376 377 377 search_start = max(key.offset, start); 378 378 if (recow) { 379 - btrfs_release_path(root, path); 379 + btrfs_release_path(path); 380 380 continue; 381 381 } 382 382 ··· 393 393 ret = btrfs_duplicate_item(trans, root, path, 394 394 &new_key); 395 395 if (ret == -EAGAIN) { 396 - btrfs_release_path(root, path); 396 + btrfs_release_path(path); 397 397 continue; 398 398 } 399 399 if (ret < 0) ··· 516 516 del_nr = 0; 517 517 del_slot = 0; 518 518 519 - btrfs_release_path(root, path); 519 + btrfs_release_path(path); 520 520 continue; 521 521 } 522 522 ··· 681 681 new_key.offset = split; 682 682 ret = btrfs_duplicate_item(trans, root, path, &new_key); 683 683 if (ret == -EAGAIN) { 684 - btrfs_release_path(root, path); 684 + btrfs_release_path(path); 685 685 goto again; 686 686 } 687 687 BUG_ON(ret < 0); ··· 721 721 inode->i_ino, bytenr, orig_offset, 722 722 &other_start, &other_end)) { 723 723 if (recow) { 724 - btrfs_release_path(root, path); 724 + btrfs_release_path(path); 725 725 goto again; 726 726 } 727 727 extent_end = other_end; ··· 738 738 inode->i_ino, bytenr, orig_offset, 739 739 &other_start, &other_end)) { 740 740 if (recow) { 741 - btrfs_release_path(root, path); 741 + btrfs_release_path(path); 742 742 goto again; 743 743 } 744 744 key.offset = other_start;
+7 -7
fs/btrfs/free-space-cache.c
··· 61 61 if (ret < 0) 62 62 return ERR_PTR(ret); 63 63 if (ret > 0) { 64 - btrfs_release_path(root, path); 64 + btrfs_release_path(path); 65 65 return ERR_PTR(-ENOENT); 66 66 } 67 67 ··· 70 70 struct btrfs_free_space_header); 71 71 btrfs_free_space_key(leaf, header, &disk_key); 72 72 btrfs_disk_key_to_cpu(&location, &disk_key); 73 - btrfs_release_path(root, path); 73 + btrfs_release_path(path); 74 74 75 75 inode = btrfs_iget(root->fs_info->sb, &location, root, NULL); 76 76 if (!inode) ··· 134 134 btrfs_set_inode_block_group(leaf, inode_item, 135 135 block_group->key.objectid); 136 136 btrfs_mark_buffer_dirty(leaf); 137 - btrfs_release_path(root, path); 137 + btrfs_release_path(path); 138 138 139 139 key.objectid = BTRFS_FREE_SPACE_OBJECTID; 140 140 key.offset = block_group->key.objectid; ··· 143 143 ret = btrfs_insert_empty_item(trans, root, path, &key, 144 144 sizeof(struct btrfs_free_space_header)); 145 145 if (ret < 0) { 146 - btrfs_release_path(root, path); 146 + btrfs_release_path(path); 147 147 return ret; 148 148 } 149 149 leaf = path->nodes[0]; ··· 152 152 memset_extent_buffer(leaf, 0, (unsigned long)header, sizeof(*header)); 153 153 btrfs_set_free_space_key(leaf, header, &disk_key); 154 154 btrfs_mark_buffer_dirty(leaf); 155 - btrfs_release_path(root, path); 155 + btrfs_release_path(path); 156 156 157 157 return 0; 158 158 } ··· 822 822 EXTENT_DIRTY | EXTENT_DELALLOC | 823 823 EXTENT_DO_ACCOUNTING, 0, 0, NULL, 824 824 GFP_NOFS); 825 - btrfs_release_path(root, path); 825 + btrfs_release_path(path); 826 826 goto out_free; 827 827 } 828 828 } ··· 832 832 btrfs_set_free_space_bitmaps(leaf, header, bitmaps); 833 833 btrfs_set_free_space_generation(leaf, header, trans->transid); 834 834 btrfs_mark_buffer_dirty(leaf); 835 - btrfs_release_path(root, path); 835 + btrfs_release_path(path); 836 836 837 837 ret = 1; 838 838
+17 -17
fs/btrfs/inode.c
··· 1164 1164 goto next_slot; 1165 1165 } 1166 1166 1167 - btrfs_release_path(root, path); 1167 + btrfs_release_path(path); 1168 1168 if (cow_start != (u64)-1) { 1169 1169 ret = cow_file_range(inode, locked_page, cow_start, 1170 1170 found_key.offset - 1, page_started, ··· 1222 1222 if (cur_offset > end) 1223 1223 break; 1224 1224 } 1225 - btrfs_release_path(root, path); 1225 + btrfs_release_path(path); 1226 1226 1227 1227 if (cur_offset <= end && cow_start == (u64)-1) 1228 1228 cow_start = cur_offset; ··· 2346 2346 break; 2347 2347 2348 2348 /* release the path since we're done with it */ 2349 - btrfs_release_path(root, path); 2349 + btrfs_release_path(path); 2350 2350 2351 2351 /* 2352 2352 * this is where we are basically btrfs_lookup, without the ··· 2712 2712 ret = btrfs_delete_one_dir_name(trans, root, path, di); 2713 2713 if (ret) 2714 2714 goto err; 2715 - btrfs_release_path(root, path); 2715 + btrfs_release_path(path); 2716 2716 2717 2717 ret = btrfs_del_inode_ref(trans, root, name, name_len, 2718 2718 inode->i_ino, ··· 2735 2735 goto err; 2736 2736 } 2737 2737 ret = btrfs_delete_one_dir_name(trans, root, path, di); 2738 - btrfs_release_path(root, path); 2738 + btrfs_release_path(path); 2739 2739 2740 2740 ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len, 2741 2741 inode, dir->i_ino); ··· 2862 2862 } else { 2863 2863 check_link = 0; 2864 2864 } 2865 - btrfs_release_path(root, path); 2865 + btrfs_release_path(path); 2866 2866 2867 2867 ret = btrfs_lookup_inode(trans, root, path, 2868 2868 &BTRFS_I(inode)->location, 0); ··· 2876 2876 } else { 2877 2877 check_link = 0; 2878 2878 } 2879 - btrfs_release_path(root, path); 2879 + btrfs_release_path(path); 2880 2880 2881 2881 if (ret == 0 && S_ISREG(inode->i_mode)) { 2882 2882 ret = btrfs_lookup_file_extent(trans, root, path, ··· 2888 2888 BUG_ON(ret == 0); 2889 2889 if (check_path_shared(root, path)) 2890 2890 goto out; 2891 - btrfs_release_path(root, path); 2891 + btrfs_release_path(path); 2892 2892 } 2893 2893 2894 2894 if (!check_link) { ··· 2909 2909 err = 0; 2910 2910 goto out; 2911 2911 } 2912 - btrfs_release_path(root, path); 2912 + btrfs_release_path(path); 2913 2913 2914 2914 ref = btrfs_lookup_inode_ref(trans, root, path, 2915 2915 dentry->d_name.name, dentry->d_name.len, ··· 2922 2922 if (check_path_shared(root, path)) 2923 2923 goto out; 2924 2924 index = btrfs_inode_ref_index(path->nodes[0], ref); 2925 - btrfs_release_path(root, path); 2925 + btrfs_release_path(path); 2926 2926 2927 2927 di = btrfs_lookup_dir_index_item(trans, root, path, dir->i_ino, index, 2928 2928 dentry->d_name.name, dentry->d_name.len, 0); ··· 3013 3013 WARN_ON(key.type != BTRFS_ROOT_ITEM_KEY || key.objectid != objectid); 3014 3014 ret = btrfs_delete_one_dir_name(trans, root, path, di); 3015 3015 BUG_ON(ret); 3016 - btrfs_release_path(root, path); 3016 + btrfs_release_path(path); 3017 3017 3018 3018 ret = btrfs_del_root_ref(trans, root->fs_info->tree_root, 3019 3019 objectid, root->root_key.objectid, ··· 3026 3026 3027 3027 leaf = path->nodes[0]; 3028 3028 btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); 3029 - btrfs_release_path(root, path); 3029 + btrfs_release_path(path); 3030 3030 index = key.offset; 3031 3031 } 3032 3032 ··· 3039 3039 WARN_ON(key.type != BTRFS_ROOT_ITEM_KEY || key.objectid != objectid); 3040 3040 ret = btrfs_delete_one_dir_name(trans, root, path, di); 3041 3041 BUG_ON(ret); 3042 - btrfs_release_path(root, path); 3042 + btrfs_release_path(path); 3043 3043 3044 3044 btrfs_i_size_write(dir, dir->i_size - name_len * 2); 3045 3045 dir->i_mtime = dir->i_ctime = CURRENT_TIME; ··· 3477 3477 BUG_ON(ret); 3478 3478 pending_del_nr = 0; 3479 3479 } 3480 - btrfs_release_path(root, path); 3480 + btrfs_release_path(path); 3481 3481 goto search_again; 3482 3482 } else { 3483 3483 path->slots[0]--; ··· 3899 3899 if (ret) 3900 3900 goto out; 3901 3901 3902 - btrfs_release_path(root->fs_info->tree_root, path); 3902 + btrfs_release_path(path); 3903 3903 3904 3904 new_root = btrfs_read_fs_root_no_name(root->fs_info, location); 3905 3905 if (IS_ERR(new_root)) { ··· 5223 5223 kunmap(page); 5224 5224 free_extent_map(em); 5225 5225 em = NULL; 5226 - btrfs_release_path(root, path); 5226 + btrfs_release_path(path); 5227 5227 trans = btrfs_join_transaction(root, 1); 5228 5228 if (IS_ERR(trans)) 5229 5229 return ERR_CAST(trans); ··· 5249 5249 em->block_start = EXTENT_MAP_HOLE; 5250 5250 set_bit(EXTENT_FLAG_VACANCY, &em->flags); 5251 5251 insert: 5252 - btrfs_release_path(root, path); 5252 + btrfs_release_path(path); 5253 5253 if (em->start > start || extent_map_end(em) <= start) { 5254 5254 printk(KERN_ERR "Btrfs: bad extent! em: [%llu %llu] passed " 5255 5255 "[%llu %llu]\n", (unsigned long long)em->start,
+6 -6
fs/btrfs/ioctl.c
··· 1396 1396 } 1397 1397 ret = copy_to_sk(root, path, &key, sk, args->buf, 1398 1398 &sk_offset, &num_found); 1399 - btrfs_release_path(root, path); 1399 + btrfs_release_path(path); 1400 1400 if (ret || num_found >= sk->nr_items) 1401 1401 break; 1402 1402 ··· 1503 1503 if (key.offset == BTRFS_FIRST_FREE_OBJECTID) 1504 1504 break; 1505 1505 1506 - btrfs_release_path(root, path); 1506 + btrfs_release_path(path); 1507 1507 key.objectid = key.offset; 1508 1508 key.offset = (u64)-1; 1509 1509 dirid = key.objectid; ··· 1982 1982 datal = btrfs_file_extent_ram_bytes(leaf, 1983 1983 extent); 1984 1984 } 1985 - btrfs_release_path(root, path); 1985 + btrfs_release_path(path); 1986 1986 1987 1987 if (key.offset + datal <= off || 1988 1988 key.offset >= off+len) ··· 2092 2092 } 2093 2093 2094 2094 btrfs_mark_buffer_dirty(leaf); 2095 - btrfs_release_path(root, path); 2095 + btrfs_release_path(path); 2096 2096 2097 2097 inode->i_mtime = inode->i_ctime = CURRENT_TIME; 2098 2098 ··· 2113 2113 btrfs_end_transaction(trans, root); 2114 2114 } 2115 2115 next: 2116 - btrfs_release_path(root, path); 2116 + btrfs_release_path(path); 2117 2117 key.offset++; 2118 2118 } 2119 2119 ret = 0; 2120 2120 out: 2121 - btrfs_release_path(root, path); 2121 + btrfs_release_path(path); 2122 2122 unlock_extent(&BTRFS_I(src)->io_tree, off, off+len, GFP_NOFS); 2123 2123 out_unlock: 2124 2124 mutex_unlock(&src->i_mutex);
+15 -15
fs/btrfs/relocation.c
··· 961 961 lower = upper; 962 962 upper = NULL; 963 963 } 964 - btrfs_release_path(root, path2); 964 + btrfs_release_path(path2); 965 965 next: 966 966 if (ptr < end) { 967 967 ptr += btrfs_extent_inline_ref_size(key.type); ··· 974 974 if (ptr >= end) 975 975 path1->slots[0]++; 976 976 } 977 - btrfs_release_path(rc->extent_root, path1); 977 + btrfs_release_path(path1); 978 978 979 979 cur->checked = 1; 980 980 WARN_ON(exist); ··· 1749 1749 1750 1750 btrfs_node_key_to_cpu(path->nodes[level], &key, 1751 1751 path->slots[level]); 1752 - btrfs_release_path(src, path); 1752 + btrfs_release_path(path); 1753 1753 1754 1754 path->lowest_level = level; 1755 1755 ret = btrfs_search_slot(trans, src, &key, path, 0, 1); ··· 2496 2496 path->locks[upper->level] = 0; 2497 2497 2498 2498 slot = path->slots[upper->level]; 2499 - btrfs_release_path(NULL, path); 2499 + btrfs_release_path(path); 2500 2500 } else { 2501 2501 ret = btrfs_bin_search(upper->eb, key, upper->level, 2502 2502 &slot); ··· 2737 2737 } else { 2738 2738 path->lowest_level = node->level; 2739 2739 ret = btrfs_search_slot(trans, root, key, path, 0, 1); 2740 - btrfs_release_path(root, path); 2740 + btrfs_release_path(path); 2741 2741 if (ret > 0) 2742 2742 ret = 0; 2743 2743 } ··· 3119 3119 #endif 3120 3120 } 3121 3121 3122 - btrfs_release_path(rc->extent_root, path); 3122 + btrfs_release_path(path); 3123 3123 3124 3124 BUG_ON(level == -1); 3125 3125 ··· 3505 3505 } 3506 3506 path->slots[0]++; 3507 3507 } 3508 - btrfs_release_path(rc->extent_root, path); 3508 + btrfs_release_path(path); 3509 3509 if (err) 3510 3510 free_block_list(blocks); 3511 3511 return err; ··· 3568 3568 EXTENT_DIRTY); 3569 3569 3570 3570 if (ret == 0 && start <= key.objectid) { 3571 - btrfs_release_path(rc->extent_root, path); 3571 + btrfs_release_path(path); 3572 3572 rc->search_start = end + 1; 3573 3573 } else { 3574 3574 rc->search_start = key.objectid + key.offset; ··· 3576 3576 return 0; 3577 3577 } 3578 3578 } 3579 - btrfs_release_path(rc->extent_root, path); 3579 + btrfs_release_path(path); 3580 3580 return ret; 3581 3581 } 3582 3582 ··· 3713 3713 flags = BTRFS_EXTENT_FLAG_DATA; 3714 3714 3715 3715 if (path_change) { 3716 - btrfs_release_path(rc->extent_root, path); 3716 + btrfs_release_path(path); 3717 3717 3718 3718 path->search_commit_root = 1; 3719 3719 path->skip_locking = 1; ··· 3736 3736 (flags & BTRFS_EXTENT_FLAG_DATA)) { 3737 3737 ret = add_data_references(rc, &key, path, &blocks); 3738 3738 } else { 3739 - btrfs_release_path(rc->extent_root, path); 3739 + btrfs_release_path(path); 3740 3740 ret = 0; 3741 3741 } 3742 3742 if (ret < 0) { ··· 3799 3799 } 3800 3800 } 3801 3801 3802 - btrfs_release_path(rc->extent_root, path); 3802 + btrfs_release_path(path); 3803 3803 clear_extent_bits(&rc->processed_blocks, 0, (u64)-1, EXTENT_DIRTY, 3804 3804 GFP_NOFS); 3805 3805 ··· 3867 3867 btrfs_set_inode_flags(leaf, item, BTRFS_INODE_NOCOMPRESS | 3868 3868 BTRFS_INODE_PREALLOC); 3869 3869 btrfs_mark_buffer_dirty(leaf); 3870 - btrfs_release_path(root, path); 3870 + btrfs_release_path(path); 3871 3871 out: 3872 3872 btrfs_free_path(path); 3873 3873 return ret; ··· 4109 4109 } 4110 4110 leaf = path->nodes[0]; 4111 4111 btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); 4112 - btrfs_release_path(root->fs_info->tree_root, path); 4112 + btrfs_release_path(path); 4113 4113 4114 4114 if (key.objectid != BTRFS_TREE_RELOC_OBJECTID || 4115 4115 key.type != BTRFS_ROOT_ITEM_KEY) ··· 4141 4141 4142 4142 key.offset--; 4143 4143 } 4144 - btrfs_release_path(root->fs_info->tree_root, path); 4144 + btrfs_release_path(path); 4145 4145 4146 4146 if (list_empty(&reloc_roots)) 4147 4147 goto out;
+5 -5
fs/btrfs/root-tree.c
··· 57 57 btrfs_item_key_to_cpu(path->nodes[0], &search_key, path->slots[0]); 58 58 if (search_key.type != BTRFS_ROOT_ITEM_KEY) { 59 59 search_key.offset++; 60 - btrfs_release_path(root, path); 60 + btrfs_release_path(path); 61 61 goto again; 62 62 } 63 63 ret = 0; ··· 230 230 231 231 memcpy(&found_key, &key, sizeof(key)); 232 232 key.offset++; 233 - btrfs_release_path(root, path); 233 + btrfs_release_path(path); 234 234 dead_root = 235 235 btrfs_read_fs_root_no_radix(root->fs_info->tree_root, 236 236 &found_key); ··· 292 292 } 293 293 294 294 btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); 295 - btrfs_release_path(tree_root, path); 295 + btrfs_release_path(path); 296 296 297 297 if (key.objectid != BTRFS_ORPHAN_OBJECTID || 298 298 key.type != BTRFS_ORPHAN_ITEM_KEY) ··· 390 390 err = -ENOENT; 391 391 392 392 if (key.type == BTRFS_ROOT_BACKREF_KEY) { 393 - btrfs_release_path(tree_root, path); 393 + btrfs_release_path(path); 394 394 key.objectid = ref_id; 395 395 key.type = BTRFS_ROOT_REF_KEY; 396 396 key.offset = root_id; ··· 463 463 btrfs_mark_buffer_dirty(leaf); 464 464 465 465 if (key.type == BTRFS_ROOT_BACKREF_KEY) { 466 - btrfs_release_path(tree_root, path); 466 + btrfs_release_path(path); 467 467 key.objectid = ref_id; 468 468 key.type = BTRFS_ROOT_REF_KEY; 469 469 key.offset = root_id;
+1 -1
fs/btrfs/tree-defrag.c
··· 97 97 ret = 0; 98 98 goto out; 99 99 } 100 - btrfs_release_path(root, path); 100 + btrfs_release_path(path); 101 101 wret = btrfs_search_slot(trans, root, &key, path, 0, 1); 102 102 103 103 if (wret < 0) {
+49 -49
fs/btrfs/tree-log.c
··· 333 333 goto insert; 334 334 335 335 if (item_size == 0) { 336 - btrfs_release_path(root, path); 336 + btrfs_release_path(path); 337 337 return 0; 338 338 } 339 339 dst_copy = kmalloc(item_size, GFP_NOFS); 340 340 src_copy = kmalloc(item_size, GFP_NOFS); 341 341 if (!dst_copy || !src_copy) { 342 - btrfs_release_path(root, path); 342 + btrfs_release_path(path); 343 343 kfree(dst_copy); 344 344 kfree(src_copy); 345 345 return -ENOMEM; ··· 361 361 * sync 362 362 */ 363 363 if (ret == 0) { 364 - btrfs_release_path(root, path); 364 + btrfs_release_path(path); 365 365 return 0; 366 366 } 367 367 368 368 } 369 369 insert: 370 - btrfs_release_path(root, path); 370 + btrfs_release_path(path); 371 371 /* try to insert the key into the destination tree */ 372 372 ret = btrfs_insert_empty_item(trans, root, path, 373 373 key, item_size); ··· 438 438 } 439 439 no_copy: 440 440 btrfs_mark_buffer_dirty(path->nodes[0]); 441 - btrfs_release_path(root, path); 441 + btrfs_release_path(path); 442 442 return 0; 443 443 } 444 444 ··· 544 544 * we don't have to do anything 545 545 */ 546 546 if (memcmp(&cmp1, &cmp2, sizeof(cmp1)) == 0) { 547 - btrfs_release_path(root, path); 547 + btrfs_release_path(path); 548 548 goto out; 549 549 } 550 550 } 551 - btrfs_release_path(root, path); 551 + btrfs_release_path(path); 552 552 553 553 saved_nbytes = inode_get_bytes(inode); 554 554 /* drop any overlapping extents */ ··· 600 600 key->objectid, offset, &ins); 601 601 BUG_ON(ret); 602 602 } 603 - btrfs_release_path(root, path); 603 + btrfs_release_path(path); 604 604 605 605 if (btrfs_file_extent_compression(eb, item)) { 606 606 csum_start = ins.objectid; ··· 629 629 kfree(sums); 630 630 } 631 631 } else { 632 - btrfs_release_path(root, path); 632 + btrfs_release_path(path); 633 633 } 634 634 } else if (found_type == BTRFS_FILE_EXTENT_INLINE) { 635 635 /* inline extents are easy, we just overwrite them */ ··· 675 675 return -ENOMEM; 676 676 677 677 read_extent_buffer(leaf, name, (unsigned long)(di + 1), name_len); 678 - btrfs_release_path(root, path); 678 + btrfs_release_path(path); 679 679 680 680 inode = read_one_inode(root, location.objectid); 681 681 BUG_ON(!inode); ··· 713 713 goto out; 714 714 } else 715 715 goto out; 716 - btrfs_release_path(root, path); 716 + btrfs_release_path(path); 717 717 718 718 di = btrfs_lookup_dir_item(NULL, root, path, dirid, name, name_len, 0); 719 719 if (di && !IS_ERR(di)) { ··· 724 724 goto out; 725 725 match = 1; 726 726 out: 727 - btrfs_release_path(root, path); 727 + btrfs_release_path(path); 728 728 return match; 729 729 } 730 730 ··· 884 884 if (!backref_in_log(log, key, victim_name, 885 885 victim_name_len)) { 886 886 btrfs_inc_nlink(inode); 887 - btrfs_release_path(root, path); 887 + btrfs_release_path(path); 888 888 889 889 ret = btrfs_unlink_inode(trans, root, dir, 890 890 inode, victim_name, ··· 901 901 */ 902 902 search_done = 1; 903 903 } 904 - btrfs_release_path(root, path); 904 + btrfs_release_path(path); 905 905 906 906 insert: 907 907 /* insert our name */ ··· 922 922 BUG_ON(ret); 923 923 924 924 out_nowrite: 925 - btrfs_release_path(root, path); 925 + btrfs_release_path(path); 926 926 iput(dir); 927 927 iput(inode); 928 928 return 0; ··· 999 999 if (key.offset == 0) 1000 1000 break; 1001 1001 key.offset--; 1002 - btrfs_release_path(root, path); 1002 + btrfs_release_path(path); 1003 1003 } 1004 - btrfs_release_path(root, path); 1004 + btrfs_release_path(path); 1005 1005 if (nlink != inode->i_nlink) { 1006 1006 inode->i_nlink = nlink; 1007 1007 btrfs_update_inode(trans, root, inode); ··· 1052 1052 ret = btrfs_del_item(trans, root, path); 1053 1053 BUG_ON(ret); 1054 1054 1055 - btrfs_release_path(root, path); 1055 + btrfs_release_path(path); 1056 1056 inode = read_one_inode(root, key.offset); 1057 1057 BUG_ON(!inode); 1058 1058 ··· 1068 1068 */ 1069 1069 key.offset = (u64)-1; 1070 1070 } 1071 - btrfs_release_path(root, path); 1071 + btrfs_release_path(path); 1072 1072 return 0; 1073 1073 } 1074 1074 ··· 1096 1096 1097 1097 ret = btrfs_insert_empty_item(trans, root, path, &key, 0); 1098 1098 1099 - btrfs_release_path(root, path); 1099 + btrfs_release_path(path); 1100 1100 if (ret == 0) { 1101 1101 btrfs_inc_nlink(inode); 1102 1102 btrfs_update_inode(trans, root, inode); ··· 1192 1192 exists = 1; 1193 1193 else 1194 1194 exists = 0; 1195 - btrfs_release_path(root, path); 1195 + btrfs_release_path(path); 1196 1196 1197 1197 if (key->type == BTRFS_DIR_ITEM_KEY) { 1198 1198 dst_di = btrfs_lookup_dir_item(trans, root, path, key->objectid, ··· 1236 1236 if (key->type == BTRFS_DIR_INDEX_KEY) 1237 1237 goto insert; 1238 1238 out: 1239 - btrfs_release_path(root, path); 1239 + btrfs_release_path(path); 1240 1240 kfree(name); 1241 1241 iput(dir); 1242 1242 return 0; 1243 1243 1244 1244 insert: 1245 - btrfs_release_path(root, path); 1245 + btrfs_release_path(path); 1246 1246 ret = insert_one_name(trans, root, path, key->objectid, key->offset, 1247 1247 name, name_len, log_type, &log_key); 1248 1248 ··· 1363 1363 *end_ret = found_end; 1364 1364 ret = 0; 1365 1365 out: 1366 - btrfs_release_path(root, path); 1366 + btrfs_release_path(path); 1367 1367 return ret; 1368 1368 } 1369 1369 ··· 1428 1428 } 1429 1429 if (IS_ERR_OR_NULL(log_di)) { 1430 1430 btrfs_dir_item_key_to_cpu(eb, di, &location); 1431 - btrfs_release_path(root, path); 1432 - btrfs_release_path(log, log_path); 1431 + btrfs_release_path(path); 1432 + btrfs_release_path(log_path); 1433 1433 inode = read_one_inode(root, location.objectid); 1434 1434 BUG_ON(!inode); 1435 1435 ··· 1453 1453 ret = 0; 1454 1454 goto out; 1455 1455 } 1456 - btrfs_release_path(log, log_path); 1456 + btrfs_release_path(log_path); 1457 1457 kfree(name); 1458 1458 1459 1459 ptr = (unsigned long)(di + 1); ··· 1461 1461 } 1462 1462 ret = 0; 1463 1463 out: 1464 - btrfs_release_path(root, path); 1465 - btrfs_release_path(log, log_path); 1464 + btrfs_release_path(path); 1465 + btrfs_release_path(log_path); 1466 1466 return ret; 1467 1467 } 1468 1468 ··· 1550 1550 break; 1551 1551 dir_key.offset = found_key.offset + 1; 1552 1552 } 1553 - btrfs_release_path(root, path); 1553 + btrfs_release_path(path); 1554 1554 if (range_end == (u64)-1) 1555 1555 break; 1556 1556 range_start = range_end + 1; ··· 1561 1561 if (key_type == BTRFS_DIR_LOG_ITEM_KEY) { 1562 1562 key_type = BTRFS_DIR_LOG_INDEX_KEY; 1563 1563 dir_key.type = BTRFS_DIR_INDEX_KEY; 1564 - btrfs_release_path(root, path); 1564 + btrfs_release_path(path); 1565 1565 goto again; 1566 1566 } 1567 1567 out: 1568 - btrfs_release_path(root, path); 1568 + btrfs_release_path(path); 1569 1569 btrfs_free_path(log_path); 1570 1570 iput(dir); 1571 1571 return ret; ··· 2225 2225 bytes_del += name_len; 2226 2226 BUG_ON(ret); 2227 2227 } 2228 - btrfs_release_path(log, path); 2228 + btrfs_release_path(path); 2229 2229 di = btrfs_lookup_dir_index_item(trans, log, path, dir->i_ino, 2230 2230 index, name, name_len, -1); 2231 2231 if (IS_ERR(di)) { ··· 2247 2247 key.objectid = dir->i_ino; 2248 2248 key.offset = 0; 2249 2249 key.type = BTRFS_INODE_ITEM_KEY; 2250 - btrfs_release_path(log, path); 2250 + btrfs_release_path(path); 2251 2251 2252 2252 ret = btrfs_search_slot(trans, log, &key, path, 0, 1); 2253 2253 if (ret < 0) { ··· 2269 2269 btrfs_mark_buffer_dirty(path->nodes[0]); 2270 2270 } else 2271 2271 ret = 0; 2272 - btrfs_release_path(log, path); 2272 + btrfs_release_path(path); 2273 2273 } 2274 2274 fail: 2275 2275 btrfs_free_path(path); ··· 2344 2344 struct btrfs_dir_log_item); 2345 2345 btrfs_set_dir_log_end(path->nodes[0], item, last_offset); 2346 2346 btrfs_mark_buffer_dirty(path->nodes[0]); 2347 - btrfs_release_path(log, path); 2347 + btrfs_release_path(path); 2348 2348 return 0; 2349 2349 } 2350 2350 ··· 2393 2393 min_key.objectid = inode->i_ino; 2394 2394 min_key.type = key_type; 2395 2395 min_key.offset = (u64)-1; 2396 - btrfs_release_path(root, path); 2396 + btrfs_release_path(path); 2397 2397 ret = btrfs_search_slot(NULL, root, &min_key, path, 0, 0); 2398 2398 if (ret < 0) { 2399 - btrfs_release_path(root, path); 2399 + btrfs_release_path(path); 2400 2400 return ret; 2401 2401 } 2402 2402 ret = btrfs_previous_item(root, path, inode->i_ino, key_type); ··· 2432 2432 } 2433 2433 } 2434 2434 } 2435 - btrfs_release_path(root, path); 2435 + btrfs_release_path(path); 2436 2436 2437 2437 /* find the first key from this transaction again */ 2438 2438 ret = btrfs_search_slot(NULL, root, &min_key, path, 0, 0); ··· 2490 2490 } 2491 2491 } 2492 2492 done: 2493 - btrfs_release_path(root, path); 2494 - btrfs_release_path(log, dst_path); 2493 + btrfs_release_path(path); 2494 + btrfs_release_path(dst_path); 2495 2495 2496 2496 if (err == 0) { 2497 2497 *last_offset_ret = last_offset; ··· 2588 2588 2589 2589 ret = btrfs_del_item(trans, log, path); 2590 2590 BUG_ON(ret); 2591 - btrfs_release_path(log, path); 2591 + btrfs_release_path(path); 2592 2592 } 2593 - btrfs_release_path(log, path); 2593 + btrfs_release_path(path); 2594 2594 return ret; 2595 2595 } 2596 2596 ··· 2696 2696 } 2697 2697 2698 2698 btrfs_mark_buffer_dirty(dst_path->nodes[0]); 2699 - btrfs_release_path(log, dst_path); 2699 + btrfs_release_path(dst_path); 2700 2700 kfree(ins_data); 2701 2701 2702 2702 /* ··· 2845 2845 } 2846 2846 ins_nr = 0; 2847 2847 } 2848 - btrfs_release_path(root, path); 2848 + btrfs_release_path(path); 2849 2849 2850 2850 if (min_key.offset < (u64)-1) 2851 2851 min_key.offset++; ··· 2868 2868 } 2869 2869 WARN_ON(ins_nr); 2870 2870 if (inode_only == LOG_INODE_ALL && S_ISDIR(inode->i_mode)) { 2871 - btrfs_release_path(root, path); 2872 - btrfs_release_path(log, dst_path); 2871 + btrfs_release_path(path); 2872 + btrfs_release_path(dst_path); 2873 2873 ret = log_directory_changes(trans, root, inode, path, dst_path); 2874 2874 if (ret) { 2875 2875 err = ret; ··· 3136 3136 } 3137 3137 btrfs_item_key_to_cpu(path->nodes[0], &found_key, 3138 3138 path->slots[0]); 3139 - btrfs_release_path(log_root_tree, path); 3139 + btrfs_release_path(path); 3140 3140 if (found_key.objectid != BTRFS_TREE_LOG_OBJECTID) 3141 3141 break; 3142 3142 ··· 3171 3171 if (found_key.offset == 0) 3172 3172 break; 3173 3173 } 3174 - btrfs_release_path(log_root_tree, path); 3174 + btrfs_release_path(path); 3175 3175 3176 3176 /* step one is to pin it all, step two is to replay just inodes */ 3177 3177 if (wc.pin) {
+8 -8
fs/btrfs/volumes.c
··· 1475 1475 goto error; 1476 1476 leaf = path->nodes[0]; 1477 1477 btrfs_item_key_to_cpu(leaf, &key, path->slots[0]); 1478 - btrfs_release_path(root, path); 1478 + btrfs_release_path(path); 1479 1479 continue; 1480 1480 } 1481 1481 ··· 1947 1947 chunk = btrfs_item_ptr(leaf, path->slots[0], 1948 1948 struct btrfs_chunk); 1949 1949 chunk_type = btrfs_chunk_type(leaf, chunk); 1950 - btrfs_release_path(chunk_root, path); 1950 + btrfs_release_path(path); 1951 1951 1952 1952 if (chunk_type & BTRFS_BLOCK_GROUP_SYSTEM) { 1953 1953 ret = btrfs_relocate_chunk(chunk_root, chunk_tree, ··· 2065 2065 if (found_key.offset == 0) 2066 2066 break; 2067 2067 2068 - btrfs_release_path(chunk_root, path); 2068 + btrfs_release_path(path); 2069 2069 ret = btrfs_relocate_chunk(chunk_root, 2070 2070 chunk_root->root_key.objectid, 2071 2071 found_key.objectid, ··· 2137 2137 goto done; 2138 2138 if (ret) { 2139 2139 ret = 0; 2140 - btrfs_release_path(root, path); 2140 + btrfs_release_path(path); 2141 2141 break; 2142 2142 } 2143 2143 ··· 2146 2146 btrfs_item_key_to_cpu(l, &key, path->slots[0]); 2147 2147 2148 2148 if (key.objectid != device->devid) { 2149 - btrfs_release_path(root, path); 2149 + btrfs_release_path(path); 2150 2150 break; 2151 2151 } 2152 2152 ··· 2154 2154 length = btrfs_dev_extent_length(l, dev_extent); 2155 2155 2156 2156 if (key.offset + length <= new_size) { 2157 - btrfs_release_path(root, path); 2157 + btrfs_release_path(path); 2158 2158 break; 2159 2159 } 2160 2160 2161 2161 chunk_tree = btrfs_dev_extent_chunk_tree(l, dev_extent); 2162 2162 chunk_objectid = btrfs_dev_extent_chunk_objectid(l, dev_extent); 2163 2163 chunk_offset = btrfs_dev_extent_chunk_offset(l, dev_extent); 2164 - btrfs_release_path(root, path); 2164 + btrfs_release_path(path); 2165 2165 2166 2166 ret = btrfs_relocate_chunk(root, chunk_tree, chunk_objectid, 2167 2167 chunk_offset); ··· 3813 3813 } 3814 3814 if (key.objectid == BTRFS_DEV_ITEMS_OBJECTID) { 3815 3815 key.objectid = 0; 3816 - btrfs_release_path(root, path); 3816 + btrfs_release_path(path); 3817 3817 goto again; 3818 3818 } 3819 3819 ret = 0;
+2 -2
fs/btrfs/xattr.c
··· 120 120 121 121 ret = btrfs_delete_one_dir_name(trans, root, path, di); 122 122 BUG_ON(ret); 123 - btrfs_release_path(root, path); 123 + btrfs_release_path(path); 124 124 125 125 /* if we don't have a value then we are removing the xattr */ 126 126 if (!value) 127 127 goto out; 128 128 } else { 129 - btrfs_release_path(root, path); 129 + btrfs_release_path(path); 130 130 131 131 if (flags & XATTR_REPLACE) { 132 132 /* we couldn't find the attr to replace */