github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

btrfs: pass walk_control structure to overwrite_item()

Browse Source 
Instead of passing the transaction and subvolume root as arguments to
overwrite_item(), pass the walk_control structure as we can grab them
from the structure. This reduces the number of arguments passed and it's
going to be needed by an incoming change that improves error reporting
for log replay.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Filipe Manana 2025-08-28 17:04:40 +01:00 committed by David Sterba
parent aa5b6635b0
commit 266967c0e2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/btrfs/tree-log.c
View File

@ -410,12 +410,13 @@ static int process_one_buffer(struct extent_buffer *eb,
*
* If the key isn't in the destination yet, a new item is inserted.
*/
static int overwrite_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
static int overwrite_item(struct walk_control *wc,
struct btrfs_path *path,
struct extent_buffer *eb, int slot,
struct btrfs_key *key)
{
struct btrfs_trans_handle *trans = wc->trans;
struct btrfs_root *root = wc->root;
int ret;
u32 item_size;
u64 saved_i_size = 0;
@ -739,7 +740,7 @@ static noinline int replay_one_extent(struct walk_control *wc,
if (found_type == BTRFS_FILE_EXTENT_INLINE) {
/* inline extents are easy, we just overwrite them */
ret = overwrite_item(trans, root, path, eb, slot, key);
ret = overwrite_item(wc, path, eb, slot, key);
if (ret)
goto out;
goto update_inode;
@ -1607,7 +1608,7 @@ static noinline int add_inode_ref(struct walk_control *wc,
goto out;
/* finally write the back reference in the inode */
ret = overwrite_item(trans, root, path, eb, slot, key);
ret = overwrite_item(wc, path, eb, slot, key);
out:
btrfs_release_path(path);
kfree(name.name);
@ -2657,7 +2658,7 @@ static int replay_one_buffer(struct extent_buffer *eb,
if (ret)
break;
}
ret = overwrite_item(trans, root, path, eb, i, &key);
ret = overwrite_item(wc, path, eb, i, &key);
if (ret)
break;
@ -2721,7 +2722,7 @@ static int replay_one_buffer(struct extent_buffer *eb,
/* these keys are simply copied */
if (key.type == BTRFS_XATTR_ITEM_KEY) {
ret = overwrite_item(trans, root, path, eb, i, &key);
ret = overwrite_item(wc, path, eb, i, &key);
if (ret)
break;
} else if (key.type == BTRFS_INODE_REF_KEY ||