Commit 0d031dc4 authored by Yu Zhe's avatar Yu Zhe Committed by David Sterba
Browse files

btrfs: remove unnecessary type casts 



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

Signed-off-by: default avatarYu Zhe <yuzhe@nfschina.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1a42daab

fs/btrfs/check-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ static void btrfsic_process_written_block(struct btrfsic_dev_state *dev_state, 


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

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -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;



	/*

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

fs/btrfs/ioctl.c

+2 −5
Original line number Diff line number Diff line
@@ -2596,7 +2596,7 @@ static noinline int search_ioctl(struct inode *inode, 
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;

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -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);