Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jul 2009 23:52:38 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jul 2009 23:52:38 +0000 (16:52 -0700)
commit5291a12f0503e31e0b8e90ee8e4997d59c1c3aad
tree63606ab8991540c5cb963e079be92a05fd829791
parentc7cba0623fc17fe766063d492810632366790763
parent68f5a38c3ea4ae9cc7a40f86ff6d6d031583d93a
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix error message formatting
  Btrfs: fix use after free in btrfs_start_workers fail path
  Btrfs: honor nodatacow/sum mount options for new files
  Btrfs: update backrefs while dropping snapshot
  Btrfs: account for space we may use in fallocate
  Btrfs: fix the file clone ioctl for preallocated extents
  Btrfs: don't log the inode in file_write while growing the file
fs/btrfs/ctree.h
fs/btrfs/inode.c