diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 18:52:48 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 18:52:48 +0100 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/raid56.c | |
| parent | Merge branch 'cleanups-for-4.1-v2' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | btrfs: cleanup, reduce temporary variables in btrfs_read_roots (diff) | |
| download | linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.xz linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.zip | |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/raid56.c')
| -rw-r--r-- | fs/btrfs/raid56.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index b4634c30981e..fa72068bd256 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; } |