diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/check-integrity.c | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
| download | talos-op-linux-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.gz talos-op-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/check-integrity.c')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 089d6fac01a7..ce7dec88f4b8 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); } |
