Btrfs: fsx delalloc fixes
authorChris Mason <chris.mason@oracle.com>
Thu, 30 Aug 2007 15:54:02 +0000 (11:54 -0400)
committerDavid Woodhouse <dwmw2@hera.kernel.org>
Thu, 30 Aug 2007 15:54:02 +0000 (11:54 -0400)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/extent_map.c
fs/btrfs/file.c
fs/btrfs/inode.c

Simple merge
diff --cc fs/btrfs/file.c
Simple merge
Simple merge