diff options
| author | Wang Shilong <wangshilong1991@gmail.com> | 2014-11-22 21:13:10 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-02-16 18:48:43 +0100 |
| commit | f749303bda20392e1d4a10adda84524365afd0e6 (patch) | |
| tree | 3e0856badb4fcfb0f579f42ed1066b15052b4853 | |
| parent | 01d58472a887cba61da7b4e6dc251b5170b57e2e (diff) | |
| download | linux-next-f749303bda20392e1d4a10adda84524365afd0e6.tar.gz | |
Btrfs: switch to kvfree() helper
A new helper kvfree() in mm/utils.c will do this.
Signed-off-by: Wang Shilong <wangshilong1991@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
| -rw-r--r-- | fs/btrfs/check-integrity.c | 5 | ||||
| -rw-r--r-- | fs/btrfs/raid56.c | 13 |
2 files changed, 4 insertions, 14 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index d897ef803b3b..77ba1634c9ab 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -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); } diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 5264858ed768..1ccc40bb61f5 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -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; } |