Merge branch 'for-linus' of git://

Pull btrfs deadlock fix from Chris Mason:
 "This has a fix for a long standing deadlock that we've been trying to
  nail down for a while.  It ended up being a bad interaction with the
  fair reader/writer locks and the order btrfs reacquires locks in the

* 'for-linus' of git://
  btrfs: fix lockups from btrfs_clear_path_blocking