tree 9d7b2bcc203fb3074a1f768fa30b071042690013
parent cb95413971d605b0d152d3ceecc47ba8991d66fb
parent f82c458a2c3ffb94b431fc6ad791a79df1b3713e
author Linus Torvalds <torvalds@linux-foundation.org> 1416770196 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1416770196 -0800

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

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
  btree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: fix lockups from btrfs_clear_path_blocking