Merge branch 'cleanups_and_fixes' into inode_numbers
authorChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
committerChris Mason <chris.mason@oracle.com>
Mon, 23 May 2011 18:37:47 +0000 (14:37 -0400)
commitd6c0cb379c5198487e4ac124728cbb2346d63b1f
tree167a97ac58c7a2fbf7c4e94b6abbfe1e03af014a
parent8e531cdfeb75269c6c5aae33651cca39707848da
parent1f78160ce1b1b8e657e2248118c4d91f881763f0
Merge branch 'cleanups_and_fixes' into inode_numbers

Conflicts:
fs/btrfs/tree-log.c
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
14 files changed:
fs/btrfs/ctree.c
fs/btrfs/ctree.h
fs/btrfs/dir-item.c
fs/btrfs/disk-io.c
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file-item.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c
fs/btrfs/root-tree.c
fs/btrfs/super.c
fs/btrfs/tree-log.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h