]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: pass walk_control structure to replay_xattr_deletes()
authorFilipe Manana <fdmanana@suse.com>
Wed, 27 Aug 2025 14:24:08 +0000 (15:24 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 23 Sep 2025 06:49:18 +0000 (08:49 +0200)
Instead of passing the transaction, subvolume root and log tree as
arguments to replay_xattr_deletes(), pass the walk_control structure as
we can grab all of those 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>
fs/btrfs/tree-log.c

index 4d34aee0cafa1769a49869e949ed70e30ab90d9e..cd4c5ae3e0a30d9727907af5129c93145f526240 100644 (file)
@@ -2336,12 +2336,13 @@ out:
        return ret;
 }
 
-static int replay_xattr_deletes(struct btrfs_trans_handle *trans,
-                             struct btrfs_root *root,
-                             struct btrfs_root *log,
-                             struct btrfs_path *path,
-                             const u64 ino)
+static int replay_xattr_deletes(struct walk_control *wc,
+                               struct btrfs_path *path,
+                               const u64 ino)
 {
+       struct btrfs_trans_handle *trans = wc->trans;
+       struct btrfs_root *root = wc->root;
+       struct btrfs_root *log = wc->log;
        struct btrfs_key search_key;
        struct btrfs_path *log_path;
        int i;
@@ -2645,7 +2646,7 @@ static int replay_one_buffer(struct extent_buffer *eb,
                    wc->stage == LOG_WALK_REPLAY_INODES) {
                        u32 mode;
 
-                       ret = replay_xattr_deletes(trans, root, log, path, key.objectid);
+                       ret = replay_xattr_deletes(wc, path, key.objectid);
                        if (ret)
                                break;
                        mode = btrfs_inode_mode(eb, inode_item);