]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0b79d5 03d3756)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2013 23:46:21 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2013 23:46:21 +0000 (16:46 -0700)
commit8543afd728a77907929e7fa1ba6f88061de2a5f4
tree93e5e16b5ef769093dca6cb23e44b83433f4b688tree | snapshot
parentf0b79d536aef62cb16f7a83ebe3b83344ea97a65commit | diff
parent03d37562f6520f068b155f5c44f804c5cfb20bd3commit | 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
fs/btrfs/inode.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.