tree 9a8e75db208395b8de1a2e6e5045abf56e8677a0
parent 33c929c06eb4a483a3e4ffbff58f6e4f31ae4565
parent 13e6c37b989859e70b0d73d3f2cb0aa022159b17
author Linus Torvalds <torvalds@linux-foundation.org> 1371188054 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1371188054 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "This is an assortment of crash fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: stop all workers before cleaning up roots
  Btrfs: fix use-after-free bug during umount
  Btrfs: init relocate extent_io_tree with a mapping
  btrfs: Drop inode if inode root is NULL
  Btrfs: don't delete fs_roots until after we cleanup the transaction