Commit 7790a882 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

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: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2f5b8095

fs/btrfs/tree-log.c

+7 −6
Original line number Diff line number Diff line
@@ -2336,12 +2336,13 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, 
	return ret;

}



static int replay_xattr_deletes(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct btrfs_root *log,

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);