From: Filipe Manana Date: Wed, 27 Aug 2025 14:24:08 +0000 (+0100) Subject: btrfs: pass walk_control structure to replay_xattr_deletes() X-Git-Tag: v6.18-rc1~204^2~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7790a882ca6bfe24392080605e5ba19f138ac29d;p=thirdparty%2Fkernel%2Fstable.git btrfs: pass walk_control structure to replay_xattr_deletes() 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 Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 4d34aee0cafa1..cd4c5ae3e0a30 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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);