Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38

2011-01-28 16:24:59 -05:00
parent acce952b02 4d728ec7ae
commit eab49bec41
6 changed files with 117 additions and 65 deletions
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@ -2565,6 +2565,8 @@ int close_ctree(struct btrfs_root *root)
 	kfree(fs_info->chunk_root);
 	kfree(fs_info->dev_root);
 	kfree(fs_info->csum_root);
+	kfree(fs_info);
+
 	return 0;
 }