Merge branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers

Browse source

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

...

This commit is contained in:

Chris Mason 2011-05-22 12:36:34 -04:00

parent 945d8962ce 73c5de0051

commit aa2dfb372a

3 changed files with 201 additions and 334 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

26

fs/btrfs/super.c

View file

519

fs/btrfs/volumes.c

View file

16

fs/btrfs/volumes.h

View file