]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:37:04 +0000 (18:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Apr 2010 01:37:04 +0000 (18:37 -0700)
commit5bcc9d392057ff9325fb07055c47e299b1293683
treec909145638eb5c4897ea7e424759eb9b564ebe18
parent3a05eb826cbfb15e07f6b582cb002e80886965fa
parentd83c2fb244932f580df2db4d93377778fcbee553
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: make sure the chunk allocator doesn't create zero length chunks
  Btrfs: fix data enospc check overflow
fs/btrfs/extent-tree.c
fs/btrfs/volumes.c