Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
This is the kernel portion of btrfs send/receive
Conflicts:
fs/btrfs/Makefile
fs/btrfs/backref.h
fs/btrfs/ctree.c
fs/btrfs/ioctl.c
fs/btrfs/ioctl.h
Signed-off-by:
Chris Mason <chris.mason@fusionio.com>
No related branches found
No related tags found
Showing
- fs/btrfs/Makefile 1 addition, 1 deletionfs/btrfs/Makefile
- fs/btrfs/backref.c 5 additions, 5 deletionsfs/btrfs/backref.c
- fs/btrfs/backref.h 4 additions, 0 deletionsfs/btrfs/backref.h
- fs/btrfs/check-integrity.c 4 additions, 3 deletionsfs/btrfs/check-integrity.c
- fs/btrfs/ctree.c 443 additions, 16 deletionsfs/btrfs/ctree.c
- fs/btrfs/ctree.h 62 additions, 0 deletionsfs/btrfs/ctree.h
- fs/btrfs/disk-io.c 5 additions, 3 deletionsfs/btrfs/disk-io.c
- fs/btrfs/inode.c 4 additions, 0 deletionsfs/btrfs/inode.c
- fs/btrfs/ioctl.c 108 additions, 6 deletionsfs/btrfs/ioctl.c
- fs/btrfs/ioctl.h 26 additions, 0 deletionsfs/btrfs/ioctl.h
- fs/btrfs/root-tree.c 101 additions, 6 deletionsfs/btrfs/root-tree.c
- fs/btrfs/send.c 4570 additions, 0 deletionsfs/btrfs/send.c
- fs/btrfs/send.h 133 additions, 0 deletionsfs/btrfs/send.h
- fs/btrfs/transaction.c 17 additions, 0 deletionsfs/btrfs/transaction.c
Loading
Please register or sign in to comment