Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
commit64e71303e44f3697e4568147caa966de74bdb4fb
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 18:37:00 +0000 (26 10:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Feb 2009 18:37:00 +0000 (26 10:37 -0800)
tree49c93c69aeb56e739658c00981f1410e1e354d38
parentbabb29b0a33db53704594f63f271ca6c049eddc6
parent4e06bdd6cbd5105376e7caf4e683ed131e777389
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: try committing transaction before returning ENOSPC
  Btrfs: add better -ENOSPC handling