]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 02:03:09 +0000 (19:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Aug 2009 02:03:09 +0000 (19:03 -0700)
commite9e30f7a6bda735a267746a44d1f84ec3459ad37
treee0242d5077730dabc4102b7abad9ee0c41e33bc0
parent99fae170ae4629ba94f12813aa021a127e8aca66
parent50ccb50231e600681698869c7f8dc2125edbeb3e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix balancing oops when invalidate_inode_pages2 returns EBUSY
  Btrfs: correct error-handling zlib error handling
  Btrfs: remove superfluous NULL pointer check in btrfs_rename()
  Btrfs: make sure the async caching thread advances the key
  Btrfs: fix btrfs_remove_from_free_space corner case
fs/btrfs/inode.c