Commit 1b51d6fc authored by David Sterba's avatar David Sterba

btrfs: send: remove indirect callback parameter for changed_cb

There's a custom callback passed to btrfs_compare_trees which happens to
be named exactly same as the existing function implementing it. This is
confusing and the indirection is not necessary for our needs. Compiler
is clever enough to call it directly so there's effectively no change.
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8bb1cf1b
...@@ -278,11 +278,6 @@ enum btrfs_compare_tree_result { ...@@ -278,11 +278,6 @@ enum btrfs_compare_tree_result {
BTRFS_COMPARE_TREE_CHANGED, BTRFS_COMPARE_TREE_CHANGED,
BTRFS_COMPARE_TREE_SAME, BTRFS_COMPARE_TREE_SAME,
}; };
typedef int (*btrfs_changed_cb_t)(struct btrfs_path *left_path,
struct btrfs_path *right_path,
struct btrfs_key *key,
enum btrfs_compare_tree_result result,
void *ctx);
__cold __cold
static void inconsistent_snapshot_error(struct send_ctx *sctx, static void inconsistent_snapshot_error(struct send_ctx *sctx,
...@@ -6692,8 +6687,7 @@ static int tree_compare_item(struct btrfs_path *left_path, ...@@ -6692,8 +6687,7 @@ static int tree_compare_item(struct btrfs_path *left_path,
* If it detects a change, it aborts immediately. * If it detects a change, it aborts immediately.
*/ */
static int btrfs_compare_trees(struct btrfs_root *left_root, static int btrfs_compare_trees(struct btrfs_root *left_root,
struct btrfs_root *right_root, struct btrfs_root *right_root, void *ctx)
btrfs_changed_cb_t changed_cb, void *ctx)
{ {
struct btrfs_fs_info *fs_info = left_root->fs_info; struct btrfs_fs_info *fs_info = left_root->fs_info;
int ret; int ret;
...@@ -6960,8 +6954,7 @@ static int send_subvol(struct send_ctx *sctx) ...@@ -6960,8 +6954,7 @@ static int send_subvol(struct send_ctx *sctx)
goto out; goto out;
if (sctx->parent_root) { if (sctx->parent_root) {
ret = btrfs_compare_trees(sctx->send_root, sctx->parent_root, ret = btrfs_compare_trees(sctx->send_root, sctx->parent_root, sctx);
changed_cb, sctx);
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = finish_inode_if_needed(sctx, 1); ret = finish_inode_if_needed(sctx, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment