Re: [PATCH 2/2] btrfs: Use reada_control pointer instead of void pointer

[Anand Jain]

On 07/04/2021 00:24, Goldwyn Rodrigues wrote:

From: Goldwyn Rodrigues <rgold...@suse.com>

Since struct reada_control is defined in ctree.h,
Use struct reada_control pointer as a function argument for
btrfs_reada_wait() instead of a void pointer in order > to avoid type-casting 
within the function.

yep.

Signed-off-by: Goldwyn Rodrigues <rgold...@suse.com>

Reviewed-by: Anand Jain <anand.j...@oralce.com>

---
  fs/btrfs/ctree.h | 2 +-
  fs/btrfs/reada.c | 6 ++----
  2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 2acbd8919611..8bf434a4f014 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3699,7 +3699,7 @@ struct reada_control {
  };
  struct reada_control *btrfs_reada_add(struct btrfs_root *root,
                              struct btrfs_key *start, struct btrfs_key *end);
-int btrfs_reada_wait(void *handle);
+int btrfs_reada_wait(struct reada_control *rc);
  int btree_readahead_hook(struct extent_buffer *eb, int err);
  void btrfs_reada_remove_dev(struct btrfs_device *dev);
  void btrfs_reada_undo_remove_dev(struct btrfs_device *dev);
diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 0d357f8b65bc..9bfa47cd3920 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -998,9 +998,8 @@ struct reada_control *btrfs_reada_add(struct btrfs_root 
*root,
  }

#ifdef DEBUG

-int btrfs_reada_wait(void *handle)
+int btrfs_reada_wait(struct reada_control *rc)
  {
-       struct reada_control *rc = handle;
        struct btrfs_fs_info *fs_info = rc->fs_info;

while (atomic_read(&rc->elems)) {

@@ -1018,9 +1017,8 @@ int btrfs_reada_wait(void *handle)
        return 0;
  }
  #else
-int btrfs_reada_wait(void *handle)
+int btrfs_reada_wait(struct reada_control *rc)
  {
-       struct reada_control *rc = handle;
        struct btrfs_fs_info *fs_info = rc->fs_info;

while (atomic_read(&rc->elems)) {