tree ffe6ea833b4310d063a4a40435ba8877c396a303
parent cb49f577879519d1bff5898d9eec72dd441286cb
parent 7cf96da3ec7ca225acf4f284b0e904a1f5f98821
author Linus Torvalds <torvalds@linux-foundation.org> 1303831618 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303831618 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: cleanup error handling in inode.c
  Btrfs: put the right bio if we have an error
  Btrfs: free bitmaps properly when evicting the cache
  Btrfs: Free free_space item properly in btrfs_trim_block_group()
  btrfs: add missing spin_unlock to a rare exit path
  Btrfs: check return value of kmalloc()
  btrfs: fix wrong allocating flag when reading page
  Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()