diff options
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 44 | 
1 files changed, 22 insertions, 22 deletions
| diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6a3d53783d55..a160f11465f8 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -379,7 +379,7 @@ again:  				break;  			caching_ctl->progress = last; -			btrfs_release_path(extent_root, path); +			btrfs_release_path(path);  			up_read(&fs_info->extent_commit_sem);  			mutex_unlock(&caching_ctl->mutex);  			if (btrfs_transaction_in_commit(fs_info)) @@ -754,7 +754,7 @@ again:  			atomic_inc(&head->node.refs);  			spin_unlock(&delayed_refs->lock); -			btrfs_release_path(root->fs_info->extent_root, path); +			btrfs_release_path(path);  			mutex_lock(&head->mutex);  			mutex_unlock(&head->mutex); @@ -934,7 +934,7 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans,  			break;  		}  	} -	btrfs_release_path(root, path); +	btrfs_release_path(path);  	if (owner < BTRFS_FIRST_FREE_OBJECTID)  		new_size += sizeof(*bi); @@ -1042,7 +1042,7 @@ again:  			return 0;  #ifdef BTRFS_COMPAT_EXTENT_TREE_V0  		key.type = BTRFS_EXTENT_REF_V0_KEY; -		btrfs_release_path(root, path); +		btrfs_release_path(path);  		ret = btrfs_search_slot(trans, root, &key, path, -1, 1);  		if (ret < 0) {  			err = ret; @@ -1080,7 +1080,7 @@ again:  		if (match_extent_data_ref(leaf, ref, root_objectid,  					  owner, offset)) {  			if (recow) { -				btrfs_release_path(root, path); +				btrfs_release_path(path);  				goto again;  			}  			err = 0; @@ -1141,7 +1141,7 @@ static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,  			if (match_extent_data_ref(leaf, ref, root_objectid,  						  owner, offset))  				break; -			btrfs_release_path(root, path); +			btrfs_release_path(path);  			key.offset++;  			ret = btrfs_insert_empty_item(trans, root, path, &key,  						      size); @@ -1167,7 +1167,7 @@ static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,  	btrfs_mark_buffer_dirty(leaf);  	ret = 0;  fail: -	btrfs_release_path(root, path); +	btrfs_release_path(path);  	return ret;  } @@ -1293,7 +1293,7 @@ static noinline int lookup_tree_block_ref(struct btrfs_trans_handle *trans,  		ret = -ENOENT;  #ifdef BTRFS_COMPAT_EXTENT_TREE_V0  	if (ret == -ENOENT && parent) { -		btrfs_release_path(root, path); +		btrfs_release_path(path);  		key.type = BTRFS_EXTENT_REF_V0_KEY;  		ret = btrfs_search_slot(trans, root, &key, path, -1, 1);  		if (ret > 0) @@ -1322,7 +1322,7 @@ static noinline int insert_tree_block_ref(struct btrfs_trans_handle *trans,  	}  	ret = btrfs_insert_empty_item(trans, root, path, &key, 0); -	btrfs_release_path(root, path); +	btrfs_release_path(path);  	return ret;  } @@ -1608,7 +1608,7 @@ static int lookup_extent_backref(struct btrfs_trans_handle *trans,  	if (ret != -ENOENT)  		return ret; -	btrfs_release_path(root, path); +	btrfs_release_path(path);  	*ref_ret = NULL;  	if (owner < BTRFS_FIRST_FREE_OBJECTID) { @@ -1862,7 +1862,7 @@ static int __btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,  		__run_delayed_extent_op(extent_op, leaf, item);  	btrfs_mark_buffer_dirty(leaf); -	btrfs_release_path(root->fs_info->extent_root, path); +	btrfs_release_path(path);  	path->reada = 1;  	path->leave_spinning = 1; @@ -2361,7 +2361,7 @@ static noinline int check_delayed_ref(struct btrfs_trans_handle *trans,  		atomic_inc(&head->node.refs);  		spin_unlock(&delayed_refs->lock); -		btrfs_release_path(root->fs_info->extent_root, path); +		btrfs_release_path(path);  		mutex_lock(&head->mutex);  		mutex_unlock(&head->mutex); @@ -2732,7 +2732,7 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,  	bi = btrfs_item_ptr_offset(leaf, path->slots[0]);  	write_extent_buffer(leaf, &cache->item, bi, sizeof(cache->item));  	btrfs_mark_buffer_dirty(leaf); -	btrfs_release_path(extent_root, path); +	btrfs_release_path(path);  fail:  	if (ret)  		return ret; @@ -2785,7 +2785,7 @@ again:  	inode = lookup_free_space_inode(root, block_group, path);  	if (IS_ERR(inode) && PTR_ERR(inode) != -ENOENT) {  		ret = PTR_ERR(inode); -		btrfs_release_path(root, path); +		btrfs_release_path(path);  		goto out;  	} @@ -2854,7 +2854,7 @@ again:  out_put:  	iput(inode);  out_free: -	btrfs_release_path(root, path); +	btrfs_release_path(path);  out:  	spin_lock(&block_group->lock);  	block_group->disk_cache_state = dcs; @@ -4541,7 +4541,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,  						    NULL, refs_to_drop,  						    is_data);  			BUG_ON(ret); -			btrfs_release_path(extent_root, path); +			btrfs_release_path(path);  			path->leave_spinning = 1;  			key.objectid = bytenr; @@ -4580,7 +4580,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,  					     owner_objectid, 0);  		BUG_ON(ret < 0); -		btrfs_release_path(extent_root, path); +		btrfs_release_path(path);  		path->leave_spinning = 1;  		key.objectid = bytenr; @@ -4650,7 +4650,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,  		ret = btrfs_del_items(trans, extent_root, path, path->slots[0],  				      num_to_del);  		BUG_ON(ret); -		btrfs_release_path(extent_root, path); +		btrfs_release_path(path);  		if (is_data) {  			ret = btrfs_del_csums(trans, root, bytenr, num_bytes); @@ -6480,7 +6480,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,  				trans->block_rsv = block_rsv;  		}  	} -	btrfs_release_path(root, path); +	btrfs_release_path(path);  	BUG_ON(err);  	ret = btrfs_del_root(trans, tree_root, &root->root_key); @@ -8580,7 +8580,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)  		memcpy(&cache->key, &found_key, sizeof(found_key));  		key.objectid = found_key.objectid + found_key.offset; -		btrfs_release_path(root, path); +		btrfs_release_path(path);  		cache->flags = btrfs_block_group_flags(&cache->item);  		cache->sectorsize = root->sectorsize; @@ -8802,12 +8802,12 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,  	if (ret < 0)  		goto out;  	if (ret > 0) -		btrfs_release_path(tree_root, path); +		btrfs_release_path(path);  	if (ret == 0) {  		ret = btrfs_del_item(trans, tree_root, path);  		if (ret)  			goto out; -		btrfs_release_path(tree_root, path); +		btrfs_release_path(path);  	}  	spin_lock(&root->fs_info->block_group_cache_lock); | 
