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/inode.c
+++ b/fs/btrfs/inode.c
@@ -1557,6 +1557,7 @@ out:
 out_page:
 	unlock_page(page);
 	page_cache_release(page);
+	kfree(fixup);
 }

 /*