| commit | bdeeab62a611f1f7cd48fd285ce568e8dcd0455a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 18 16:46:21 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 18 16:46:21 2013 -0700 |
| tree | 93e5e16b5ef769093dca6cb23e44b83433f4b688 | |
| parent | 797afdf70844c719d229174c460687fb17af9762 [diff] | |
| parent | 1bda19eb73d68b304148e67253e47cef049a419d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fix from Chris Mason: "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a regression in our initial rc1 pull. When doing nocow writes we were sometimes starting a transaction with locks held" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: release path before starting transaction in can_nocow_extent