btrfs: send: use struct send_ctx *sctx for btrfs_compare_trees and changed_cb

btrfs_compare_trees and changed_cb use a void *ctx parameter instead of
struct send_ctx *sctx but when used in changed_cb it is immediately
cast to `struct send_ctx *sctx = ctx;`.

changed_cb is only ever called from btrfs_compare_trees and full_send_tree:
- full_send_tree already passes a struct send_ctx *sctx
- btrfs_compare_trees is only called by send_subvol with a struct send_ctx *sctx
- void *ctx in btrfs_compare_trees is only used to be passed to changed_cb

So casting to/from void *ctx seems unnecessary and directly using
struct send_ctx *sctx instead provides better type-safety.

The original reason for using void *ctx in the first place seems to have
been dropped with 1b51d6fce45e ("btrfs: send: remove indirect callback
parameter for changed_cb").

Signed-off-by: Roman Anasal <roman.anasal@bdsu.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 3bcbf2bcb869cd5d1f5abd65cd040bdf0f2a3f57..f87878274e9fbb85f1dc3b95cf6d6f90ced1fa24 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -6591,10 +6591,9 @@ static int changed_cb(struct btrfs_path *left_path,
                      struct btrfs_path *right_path,
                      struct btrfs_key *key,
                      enum btrfs_compare_tree_result result,
                      struct btrfs_path *right_path,
                      struct btrfs_key *key,
                      enum btrfs_compare_tree_result result,

-                     void *ctx)
+                     struct send_ctx *sctx)

 {
        int ret = 0;
 {
        int ret = 0;

-       struct send_ctx *sctx = ctx;

 
        if (result == BTRFS_COMPARE_TREE_SAME) {
                if (key->type == BTRFS_INODE_REF_KEY ||
 
        if (result == BTRFS_COMPARE_TREE_SAME) {
                if (key->type == BTRFS_INODE_REF_KEY ||


@@ -6799,7 +6798,7 @@ static int tree_compare_item(struct btrfs_path *left_path,
  * If it detects a change, it aborts immediately.
  */
 static int btrfs_compare_trees(struct btrfs_root *left_root,
  * If it detects a change, it aborts immediately.
  */
 static int btrfs_compare_trees(struct btrfs_root *left_root,

-                       struct btrfs_root *right_root, void *ctx)
+                       struct btrfs_root *right_root, struct send_ctx *sctx)

 {
        struct btrfs_fs_info *fs_info = left_root->fs_info;
        int ret;
 {
        struct btrfs_fs_info *fs_info = left_root->fs_info;
        int ret;


@@ -6951,7 +6950,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,

-                                               ctx);
+                                               sctx);

                                if (ret < 0)
                                        goto out;
                        }
                                if (ret < 0)
                                        goto out;
                        }


@@ -6962,7 +6961,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,

-                                               ctx);
+                                               sctx);

                                if (ret < 0)
                                        goto out;
                        }
                                if (ret < 0)
                                        goto out;
                        }


@@ -6976,7 +6975,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,
                                ret = changed_cb(left_path, right_path,
                                                &left_key,
                                                BTRFS_COMPARE_TREE_NEW,

-                                               ctx);
+                                               sctx);

                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;
                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;


@@ -6984,7 +6983,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,
                                ret = changed_cb(left_path, right_path,
                                                &right_key,
                                                BTRFS_COMPARE_TREE_DELETED,

-                                               ctx);
+                                               sctx);

                                if (ret < 0)
                                        goto out;
                                advance_right = ADVANCE;
                                if (ret < 0)
                                        goto out;
                                advance_right = ADVANCE;


@@ -6999,7 +6998,7 @@ static int btrfs_compare_trees(struct btrfs_root *left_root,
                                else
                                        result = BTRFS_COMPARE_TREE_SAME;
                                ret = changed_cb(left_path, right_path,
                                else
                                        result = BTRFS_COMPARE_TREE_SAME;
                                ret = changed_cb(left_path, right_path,

-                                                &left_key, result, ctx);
+                                                &left_key, result, sctx);

                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;
                                if (ret < 0)
                                        goto out;
                                advance_left = ADVANCE;