btrfs: remove unnecessary type casts

Explicit type casts are not necessary when it's void* to another pointer
type.

Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index abac86a..62eb149 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -2033,7 +2033,7 @@ continue_loop:
 
 static void btrfsic_bio_end_io(struct bio *bp)
 {
-       struct btrfsic_block *block = (struct btrfsic_block *)bp->bi_private;
+       struct btrfsic_block *block = bp->bi_private;
        int iodone_w_error;
 
        /* mutex is not held! This is not save if IO is not yet completed

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 22105c8..f6eef78 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1984,7 +1984,7 @@ static void end_workqueue_fn(struct btrfs_work *work)
 
 static int cleaner_kthread(void *arg)
 {
-       struct btrfs_fs_info *fs_info = (struct btrfs_fs_info *)arg;
+       struct btrfs_fs_info *fs_info = arg;
        int again;
 
        while (1) {
@@ -3317,7 +3317,7 @@ static int init_mount_fs_info(struct btrfs_fs_info *fs_info, struct super_block
 
 static int btrfs_uuid_rescan_kthread(void *data)
 {
-       struct btrfs_fs_info *fs_info = (struct btrfs_fs_info *)data;
+       struct btrfs_fs_info *fs_info = data;
        int ret;
 
        /*

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7ddcc67..5ebc86d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8938,7 +8938,7 @@ int btrfs_drop_inode(struct inode *inode)
 
 static void init_once(void *foo)
 {
-       struct btrfs_inode *ei = (struct btrfs_inode *) foo;
+       struct btrfs_inode *ei = foo;
 
        inode_init_once(&ei->vfs_inode);
 }

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d1e1edd..9d8e468 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2596,7 +2596,7 @@ err:
 static noinline int btrfs_ioctl_tree_search(struct inode *inode,
                                            void __user *argp)
 {
-       struct btrfs_ioctl_search_args __user *uargs;
+       struct btrfs_ioctl_search_args __user *uargs = argp;
        struct btrfs_ioctl_search_key sk;
        int ret;
        size_t buf_size;
@@ -2604,8 +2604,6 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       uargs = (struct btrfs_ioctl_search_args __user *)argp;
-
        if (copy_from_user(&sk, &uargs->key, sizeof(sk)))
                return -EFAULT;
 
@@ -2628,7 +2626,7 @@ static noinline int btrfs_ioctl_tree_search(struct inode *inode,
 static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,
                                               void __user *argp)
 {
-       struct btrfs_ioctl_search_args_v2 __user *uarg;
+       struct btrfs_ioctl_search_args_v2 __user *uarg = argp;
        struct btrfs_ioctl_search_args_v2 args;
        int ret;
        size_t buf_size;
@@ -2638,7 +2636,6 @@ static noinline int btrfs_ioctl_tree_search_v2(struct inode *inode,
                return -EPERM;
 
        /* copy search header and buffer size */
-       uarg = (struct btrfs_ioctl_search_args_v2 __user *)argp;
        if (copy_from_user(&args, uarg, sizeof(args)))
                return -EFAULT;
 

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 79af494..50bdd82 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -362,7 +362,7 @@ struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info, u64 bytenr)
        rb_node = rb_simple_search(&rc->reloc_root_tree.rb_root, bytenr);
        if (rb_node) {
                node = rb_entry(rb_node, struct mapping_node, rb_node);
-               root = (struct btrfs_root *)node->data;
+               root = node->data;
        }
        spin_unlock(&rc->reloc_root_tree.lock);
        return btrfs_grab_root(root);

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 96a8ad3..d07059a 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -2790,7 +2790,7 @@ static void scrub_parity_bio_endio_worker(struct btrfs_work *work)
 
 static void scrub_parity_bio_endio(struct bio *bio)
 {
-       struct scrub_parity *sparity = (struct scrub_parity *)bio->bi_private;
+       struct scrub_parity *sparity = bio->bi_private;
        struct btrfs_fs_info *fs_info = sparity->sctx->fs_info;
 
        if (bio->bi_status)

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index b87931a..4de2c82 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -519,7 +519,7 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,
                items = calc_reclaim_items_nr(fs_info, to_reclaim) * 2;
        }
 
-       trans = (struct btrfs_trans_handle *)current->journal_info;
+       trans = current->journal_info;
 
        /*
         * If we are doing more ordered than delalloc we need to just wait on

diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
index a498065..a105b29 100644 (file)
--- a/fs/btrfs/subpage.c
+++ b/fs/btrfs/subpage.c
@@ -150,7 +150,7 @@ void btrfs_detach_subpage(const struct btrfs_fs_info *fs_info,
        if (!btrfs_is_subpage(fs_info, page) || !PagePrivate(page))
                return;
 
-       subpage = (struct btrfs_subpage *)detach_page_private(page);
+       subpage = detach_page_private(page);
        ASSERT(subpage);
        btrfs_free_subpage(subpage);
 }

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 04809d4..8a3f1bd 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -8266,7 +8266,7 @@ bool btrfs_pinned_by_swapfile(struct btrfs_fs_info *fs_info, void *ptr)
 
 static int relocating_repair_kthread(void *data)
 {
-       struct btrfs_block_group *cache = (struct btrfs_block_group *)data;
+       struct btrfs_block_group *cache = data;
        struct btrfs_fs_info *fs_info = cache->fs_info;
        u64 target;
        int ret = 0;