Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f749303b authored by Wang Shilong's avatar Wang Shilong Committed by David Sterba
Browse files

Btrfs: switch to kvfree() helper 



A new helper kvfree() in mm/utils.c will do this.

Signed-off-by: default avatarWang Shilong <wangshilong1991@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 01d58472

fs/btrfs/check-integrity.c

+1 −4
Original line number Diff line number Diff line
@@ -3241,8 +3241,5 @@ void btrfsic_unmount(struct btrfs_root *root, 


	mutex_unlock(&btrfsic_mutex);



	if (is_vmalloc_addr(state))

		vfree(state);

	else

		kfree(state);

	kvfree(state);

}

fs/btrfs/raid56.c

+3 −10
Original line number Diff line number Diff line
@@ -237,12 +237,8 @@ int btrfs_alloc_stripe_hash_table(struct btrfs_fs_info *info) 
	}



	x = cmpxchg(&info->stripe_hash_table, NULL, table);

	if (x) {

		if (is_vmalloc_addr(x))

			vfree(x);

		else

			kfree(x);

	}

	if (x)

		kvfree(x);

	return 0;

}
@@ -453,10 +449,7 @@ void btrfs_free_stripe_hash_table(struct btrfs_fs_info *info) 
	if (!info->stripe_hash_table)

		return;

	btrfs_clear_rbio_cache(info);

	if (is_vmalloc_addr(info->stripe_hash_table))

		vfree(info->stripe_hash_table);

	else

		kfree(info->stripe_hash_table);

	kvfree(info->stripe_hash_table);

	info->stripe_hash_table = NULL;

}