RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-05-16 23:08:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: rename clear_extent_buffer_dirty to btrfs_clear_buffer_dirty

Browse Source 
This is a mirror of the change I've done in the kernel, but in progs
it's even more simply because clean_tree_block was just a wrapper around
clear_extent_buffer_dirty.  Change this to btrfs_clear_buffer_dirty, and
then update all the callers to use this helper instead of
clean_tree_block and clear_extent_buffer_dirty.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2023-04-19 17:20:49 -04:00 committed by David Sterba
parent d65c4884cd
commit 656938b665
7 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/rescue.c
View File

@ -340,7 +340,7 @@ static int clear_uuid_tree(struct btrfs_fs_info *fs_info)
if (ret < 0) if (ret < 0)
goto out; goto out;
list_del(&uuid_root->dirty_list); list_del(&uuid_root->dirty_list);
ret = clean_tree_block(uuid_root->node); ret = btrfs_clear_buffer_dirty(uuid_root->node);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = btrfs_free_tree_block(trans, uuid_root, uuid_root->node, 0, 1); ret = btrfs_free_tree_block(trans, uuid_root, uuid_root->node, 0, 1);

12
kernel-shared/ctree.c
View File

@ -433,7 +433,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
ret = btrfs_dec_ref(trans, root, buf, 1); ret = btrfs_dec_ref(trans, root, buf, 1);
BUG_ON(ret); BUG_ON(ret);
} }
clean_tree_block(buf); btrfs_clear_buffer_dirty(buf);
} }
return 0; return 0;
} }
@ -936,7 +936,7 @@ static int balance_level(struct btrfs_trans_handle *trans,
root->node = child; root->node = child;
add_root_to_dirty_list(root); add_root_to_dirty_list(root);
path->nodes[level] = NULL; path->nodes[level] = NULL;
clean_tree_block(mid); btrfs_clear_buffer_dirty(mid);
/* once for the path */ /* once for the path */
free_extent_buffer(mid); free_extent_buffer(mid);
@ -991,7 +991,7 @@ static int balance_level(struct btrfs_trans_handle *trans,
u64 bytenr = right->start; u64 bytenr = right->start;
u32 blocksize = right->len; u32 blocksize = right->len;
clean_tree_block(right); btrfs_clear_buffer_dirty(right);
free_extent_buffer(right); free_extent_buffer(right);
right = NULL; right = NULL;
wret = btrfs_del_ptr(root, path, level + 1, pslot + 1); wret = btrfs_del_ptr(root, path, level + 1, pslot + 1);
@ -1039,7 +1039,7 @@ static int balance_level(struct btrfs_trans_handle *trans,
/* we've managed to empty the middle node, drop it */ /* we've managed to empty the middle node, drop it */
u64 bytenr = mid->start; u64 bytenr = mid->start;
u32 blocksize = mid->len; u32 blocksize = mid->len;
clean_tree_block(mid); btrfs_clear_buffer_dirty(mid);
free_extent_buffer(mid); free_extent_buffer(mid);
mid = NULL; mid = NULL;
wret = btrfs_del_ptr(root, path, level + 1, pslot); wret = btrfs_del_ptr(root, path, level + 1, pslot);
@ -3012,7 +3012,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
if (leaf == root->node) { if (leaf == root->node) {
btrfs_set_header_level(leaf, 0); btrfs_set_header_level(leaf, 0);
} else { } else {
clean_tree_block(leaf); btrfs_clear_buffer_dirty(leaf);
wret = btrfs_del_leaf(trans, root, path, leaf); wret = btrfs_del_leaf(trans, root, path, leaf);
BUG_ON(ret); BUG_ON(ret);
if (wret) if (wret)
@ -3048,7 +3048,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
} }
if (btrfs_header_nritems(leaf) == 0) { if (btrfs_header_nritems(leaf) == 0) {
clean_tree_block(leaf); btrfs_clear_buffer_dirty(leaf);
path->slots[1] = slot; path->slots[1] = slot;
ret = btrfs_del_leaf(trans, root, path, leaf); ret = btrfs_del_leaf(trans, root, path, leaf);
BUG_ON(ret); BUG_ON(ret);

7
kernel-shared/disk-io.c
View File

@ -2255,11 +2255,6 @@ skip_commit:
return err; return err;
} }
int clean_tree_block(struct extent_buffer *eb)
{
return clear_extent_buffer_dirty(eb);
}
void btrfs_mark_buffer_dirty(struct extent_buffer *eb) void btrfs_mark_buffer_dirty(struct extent_buffer *eb)
{ {
set_extent_buffer_dirty(eb); set_extent_buffer_dirty(eb);
@ -2303,7 +2298,7 @@ int btrfs_delete_and_free_root(struct btrfs_trans_handle *trans,
return ret; return ret;
list_del(&root->dirty_list); list_del(&root->dirty_list);
ret = clean_tree_block(root->node); ret = btrfs_clear_buffer_dirty(root->node);
if (ret) if (ret)
return ret; return ret;
ret = btrfs_free_tree_block(trans, root, root->node, 0, 1); ret = btrfs_free_tree_block(trans, root, root->node, 0, 1);

2
kernel-shared/extent-tree.c
View File

@ -1901,7 +1901,7 @@ static int pin_down_bytes(struct btrfs_trans_handle *trans, u64 bytenr,
if (header_owner != BTRFS_TREE_LOG_OBJECTID && if (header_owner != BTRFS_TREE_LOG_OBJECTID &&
header_transid == trans->transid && header_transid == trans->transid &&
!btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) { !btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {
clean_tree_block(buf); btrfs_clear_buffer_dirty(buf);
free_extent_buffer(buf); free_extent_buffer(buf);
return 1; return 1;
} }

2
kernel-shared/extent_io.c
View File

@ -579,7 +579,7 @@ int set_extent_buffer_dirty(struct extent_buffer *eb)
return 0; return 0;
} }
int clear_extent_buffer_dirty(struct extent_buffer *eb) int btrfs_clear_buffer_dirty(struct extent_buffer *eb)
{ {
struct extent_io_tree *tree = &eb->fs_info->dirty_buffers; struct extent_io_tree *tree = &eb->fs_info->dirty_buffers;
if (eb->flags & EXTENT_BUFFER_DIRTY) { if (eb->flags & EXTENT_BUFFER_DIRTY) {

2
kernel-shared/extent_io.h
View File

@ -124,7 +124,7 @@ void memset_extent_buffer(const struct extent_buffer *eb, char c,
int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start, int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start,
unsigned long nr); unsigned long nr);
int set_extent_buffer_dirty(struct extent_buffer *eb); int set_extent_buffer_dirty(struct extent_buffer *eb);
int clear_extent_buffer_dirty(struct extent_buffer *eb); int btrfs_clear_buffer_dirty(struct extent_buffer *eb);
int read_data_from_disk(struct btrfs_fs_info *info, void *buf, u64 logical, int read_data_from_disk(struct btrfs_fs_info *info, void *buf, u64 logical,
u64 *len, int mirror); u64 *len, int mirror);
int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset, int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset,

4
kernel-shared/transaction.c
View File

@ -161,7 +161,7 @@ again:
goto cleanup; goto cleanup;
} }
start += eb->len; start += eb->len;
clear_extent_buffer_dirty(eb); btrfs_clear_buffer_dirty(eb);
free_extent_buffer(eb); free_extent_buffer(eb);
} }
} }
@ -184,7 +184,7 @@ cleanup:
eb = find_first_extent_buffer(fs_info, start); eb = find_first_extent_buffer(fs_info, start);
BUG_ON(!eb || eb->start != start); BUG_ON(!eb || eb->start != start);
start += eb->len; start += eb->len;
clear_extent_buffer_dirty(eb); btrfs_clear_buffer_dirty(eb);
free_extent_buffer(eb); free_extent_buffer(eb);
} }
} }