tree 8ea6f2b69f8d899c2bb49f0445a93c4f232252ea
parent 90d51d56069f8c63b043bacf55c62a98df88ef67
parent 0bfaa9c5cb479cebc24979b384374fe47500b4c9
author Linus Torvalds <torvalds@linux-foundation.org> 1405912865 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405912865 -0700

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

Pull btrfs fixes from Chris Mason:
 "We have two more fixes in my for-linus branch.

  I was hoping to also include a fix for a btrfs deadlock with
  compression enabled, but we're still nailing that one down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: test for valid bdev before kobj removal in btrfs_rm_device
  Btrfs: fix abnormal long waiting in fsync