diff options
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 18 | 
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index cfb55434a46..efe9f792544 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -1604,12 +1604,12 @@ int replace_file_extents(struct btrfs_trans_handle *trans,  		ret = btrfs_inc_extent_ref(trans, root, new_bytenr,  					   num_bytes, parent,  					   btrfs_header_owner(leaf), -					   key.objectid, key.offset); +					   key.objectid, key.offset, 1);  		BUG_ON(ret);  		ret = btrfs_free_extent(trans, root, bytenr, num_bytes,  					parent, btrfs_header_owner(leaf), -					key.objectid, key.offset); +					key.objectid, key.offset, 1);  		BUG_ON(ret);  	}  	if (dirty) @@ -1778,21 +1778,23 @@ again:  		ret = btrfs_inc_extent_ref(trans, src, old_bytenr, blocksize,  					path->nodes[level]->start, -					src->root_key.objectid, level - 1, 0); +					src->root_key.objectid, level - 1, 0, +					1);  		BUG_ON(ret);  		ret = btrfs_inc_extent_ref(trans, dest, new_bytenr, blocksize,  					0, dest->root_key.objectid, level - 1, -					0); +					0, 1);  		BUG_ON(ret);  		ret = btrfs_free_extent(trans, src, new_bytenr, blocksize,  					path->nodes[level]->start, -					src->root_key.objectid, level - 1, 0); +					src->root_key.objectid, level - 1, 0, +					1);  		BUG_ON(ret);  		ret = btrfs_free_extent(trans, dest, old_bytenr, blocksize,  					0, dest->root_key.objectid, level - 1, -					0); +					0, 1);  		BUG_ON(ret);  		btrfs_unlock_up_safe(path, 0); @@ -2244,7 +2246,7 @@ again:  		} else {  			list_del_init(&reloc_root->root_list);  		} -		btrfs_drop_snapshot(reloc_root, rc->block_rsv, 0); +		btrfs_drop_snapshot(reloc_root, rc->block_rsv, 0, 1);  	}  	if (found) { @@ -2558,7 +2560,7 @@ static int do_relocation(struct btrfs_trans_handle *trans,  						node->eb->start, blocksize,  						upper->eb->start,  						btrfs_header_owner(upper->eb), -						node->level, 0); +						node->level, 0, 1);  			BUG_ON(ret);  			ret = btrfs_drop_subtree(trans, root, eb, upper->eb);  |