-
- Downloads
Merge branch 'raid56-experimental' into for-linus-3.9
Signed-off-by: 
Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/inode.c
fs/btrfs/volumes.c
Showing
- fs/btrfs/Kconfig 3 additions, 0 deletionsfs/btrfs/Kconfig
- fs/btrfs/Makefile 1 addition, 1 deletionfs/btrfs/Makefile
- fs/btrfs/compression.c 2 additions, 2 deletionsfs/btrfs/compression.c
- fs/btrfs/ctree.h 41 additions, 3 deletionsfs/btrfs/ctree.h
- fs/btrfs/delayed-ref.h 9 additions, 0 deletionsfs/btrfs/delayed-ref.h
- fs/btrfs/disk-io.c 53 additions, 9 deletionsfs/btrfs/disk-io.c
- fs/btrfs/disk-io.h 7 additions, 0 deletionsfs/btrfs/disk-io.h
- fs/btrfs/extent-tree.c 122 additions, 34 deletionsfs/btrfs/extent-tree.c
- fs/btrfs/extent_io.c 30 additions, 10 deletionsfs/btrfs/extent_io.c
- fs/btrfs/extent_io.h 1 addition, 1 deletionfs/btrfs/extent_io.h
- fs/btrfs/free-space-cache.c 42 additions, 8 deletionsfs/btrfs/free-space-cache.c
- fs/btrfs/inode.c 12 additions, 6 deletionsfs/btrfs/inode.c
- fs/btrfs/raid56.c 2080 additions, 0 deletionsfs/btrfs/raid56.c
- fs/btrfs/raid56.h 51 additions, 0 deletionsfs/btrfs/raid56.h
- fs/btrfs/scrub.c 8 additions, 0 deletionsfs/btrfs/scrub.c
- fs/btrfs/transaction.c 8 additions, 1 deletionfs/btrfs/transaction.c
- fs/btrfs/volumes.c 336 additions, 44 deletionsfs/btrfs/volumes.c
- fs/btrfs/volumes.h 8 additions, 1 deletionfs/btrfs/volumes.h
Loading
Please register or sign in to comment