diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-23 11:16:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-23 11:16:36 -0800 |
| commit | d038a63ace6cf2ce3aeafa741b73d542ffb65163 (patch) | |
| tree | 9d7b2bcc203fb3074a1f768fa30b071042690013 /include | |
| parent | cb95413971d605b0d152d3ceecc47ba8991d66fb (diff) | |
| parent | f82c458a2c3ffb94b431fc6ad791a79df1b3713e (diff) | |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions