Commit c7bcbb21 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: remove ignore_offset argument from btrfs_find_all_roots()

Currently all the callers of btrfs_find_all_roots() pass a value of false
for its ignore_offset argument. This makes the argument pointless and we
can remove it and make btrfs_find_all_roots() always pass false as the
ignore_offset argument for btrfs_find_all_roots_safe(). So just do that.
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2ac691d8
...@@ -1488,14 +1488,14 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, ...@@ -1488,14 +1488,14 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans,
int btrfs_find_all_roots(struct btrfs_trans_handle *trans, int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytenr, struct btrfs_fs_info *fs_info, u64 bytenr,
u64 time_seq, struct ulist **roots, u64 time_seq, struct ulist **roots,
bool ignore_offset, bool skip_commit_root_sem) bool skip_commit_root_sem)
{ {
int ret; int ret;
if (!trans && !skip_commit_root_sem) if (!trans && !skip_commit_root_sem)
down_read(&fs_info->commit_root_sem); down_read(&fs_info->commit_root_sem);
ret = btrfs_find_all_roots_safe(trans, fs_info, bytenr, ret = btrfs_find_all_roots_safe(trans, fs_info, bytenr,
time_seq, roots, ignore_offset); time_seq, roots, false);
if (!trans && !skip_commit_root_sem) if (!trans && !skip_commit_root_sem)
up_read(&fs_info->commit_root_sem); up_read(&fs_info->commit_root_sem);
return ret; return ret;
......
...@@ -47,7 +47,7 @@ int btrfs_find_all_leafs(struct btrfs_trans_handle *trans, ...@@ -47,7 +47,7 @@ int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,
const u64 *extent_item_pos, bool ignore_offset); const u64 *extent_item_pos, bool ignore_offset);
int btrfs_find_all_roots(struct btrfs_trans_handle *trans, int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytenr, struct btrfs_fs_info *fs_info, u64 bytenr,
u64 time_seq, struct ulist **roots, bool ignore_offset, u64 time_seq, struct ulist **roots,
bool skip_commit_root_sem); bool skip_commit_root_sem);
char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,
u32 name_len, unsigned long name_off, u32 name_len, unsigned long name_off,
......
...@@ -1733,7 +1733,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans, ...@@ -1733,7 +1733,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
ASSERT(trans != NULL); ASSERT(trans != NULL);
ret = btrfs_find_all_roots(NULL, trans->fs_info, bytenr, 0, &old_root, ret = btrfs_find_all_roots(NULL, trans->fs_info, bytenr, 0, &old_root,
false, true); true);
if (ret < 0) { if (ret < 0) {
trans->fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; trans->fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
btrfs_warn(trans->fs_info, btrfs_warn(trans->fs_info,
...@@ -2651,7 +2651,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) ...@@ -2651,7 +2651,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)
/* Search commit root to find old_roots */ /* Search commit root to find old_roots */
ret = btrfs_find_all_roots(NULL, fs_info, ret = btrfs_find_all_roots(NULL, fs_info,
record->bytenr, 0, record->bytenr, 0,
&record->old_roots, false, false); &record->old_roots, false);
if (ret < 0) if (ret < 0)
goto cleanup; goto cleanup;
} }
...@@ -2667,7 +2667,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans) ...@@ -2667,7 +2667,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)
* current root. It's safe inside commit_transaction(). * current root. It's safe inside commit_transaction().
*/ */
ret = btrfs_find_all_roots(trans, fs_info, ret = btrfs_find_all_roots(trans, fs_info,
record->bytenr, BTRFS_SEQ_LAST, &new_roots, false, false); record->bytenr, BTRFS_SEQ_LAST, &new_roots, false);
if (ret < 0) if (ret < 0)
goto cleanup; goto cleanup;
if (qgroup_to_skip) { if (qgroup_to_skip) {
...@@ -3201,7 +3201,7 @@ static int qgroup_rescan_leaf(struct btrfs_trans_handle *trans, ...@@ -3201,7 +3201,7 @@ static int qgroup_rescan_leaf(struct btrfs_trans_handle *trans,
num_bytes = found.offset; num_bytes = found.offset;
ret = btrfs_find_all_roots(NULL, fs_info, found.objectid, 0, ret = btrfs_find_all_roots(NULL, fs_info, found.objectid, 0,
&roots, false, false); &roots, false);
if (ret < 0) if (ret < 0)
goto out; goto out;
/* For rescan, just pass old_roots as NULL */ /* For rescan, just pass old_roots as NULL */
......
...@@ -223,8 +223,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -223,8 +223,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
* we can only call btrfs_qgroup_account_extent() directly to test * we can only call btrfs_qgroup_account_extent() directly to test
* quota. * quota.
*/ */
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
test_err("couldn't find old roots: %d", ret); test_err("couldn't find old roots: %d", ret);
...@@ -236,8 +235,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -236,8 +235,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
if (ret) if (ret)
return ret; return ret;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
ulist_free(new_roots); ulist_free(new_roots);
...@@ -260,8 +258,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -260,8 +258,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
old_roots = NULL; old_roots = NULL;
new_roots = NULL; new_roots = NULL;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
test_err("couldn't find old roots: %d", ret); test_err("couldn't find old roots: %d", ret);
...@@ -272,8 +269,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ...@@ -272,8 +269,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
if (ret) if (ret)
return -EINVAL; return -EINVAL;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
ulist_free(new_roots); ulist_free(new_roots);
...@@ -324,8 +320,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -324,8 +320,7 @@ static int test_multiple_refs(struct btrfs_root *root,
return ret; return ret;
} }
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
test_err("couldn't find old roots: %d", ret); test_err("couldn't find old roots: %d", ret);
...@@ -337,8 +332,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -337,8 +332,7 @@ static int test_multiple_refs(struct btrfs_root *root,
if (ret) if (ret)
return ret; return ret;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
ulist_free(new_roots); ulist_free(new_roots);
...@@ -359,8 +353,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -359,8 +353,7 @@ static int test_multiple_refs(struct btrfs_root *root,
return -EINVAL; return -EINVAL;
} }
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
test_err("couldn't find old roots: %d", ret); test_err("couldn't find old roots: %d", ret);
...@@ -372,8 +365,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -372,8 +365,7 @@ static int test_multiple_refs(struct btrfs_root *root,
if (ret) if (ret)
return ret; return ret;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
ulist_free(new_roots); ulist_free(new_roots);
...@@ -400,8 +392,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -400,8 +392,7 @@ static int test_multiple_refs(struct btrfs_root *root,
return -EINVAL; return -EINVAL;
} }
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
test_err("couldn't find old roots: %d", ret); test_err("couldn't find old roots: %d", ret);
...@@ -413,8 +404,7 @@ static int test_multiple_refs(struct btrfs_root *root, ...@@ -413,8 +404,7 @@ static int test_multiple_refs(struct btrfs_root *root,
if (ret) if (ret)
return ret; return ret;
ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false);
false, false);
if (ret) { if (ret) {
ulist_free(old_roots); ulist_free(old_roots);
ulist_free(new_roots); ulist_free(new_roots);
......
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