Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers

Browse Source

Conflicts:
	fs/btrfs/extent-tree.c
	fs/btrfs/free-space-cache.c
	fs/btrfs/inode.c
	fs/btrfs/tree-log.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

...

This commit is contained in:

Chris Mason

2011-05-22 12:33:42 -04:00

parent 0d0ca30f18 4ea028859b

commit 945d8962ce

38 changed files with 295 additions and 3234 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

fs/btrfs/extent-tree.c

+38 -1685

File diff suppressed because it is too large Load Diff