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>

1 files changed, 26 insertions, 0 deletions

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index 3f9701d571ea..731e2875ab93 100644
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -348,6 +348,29 @@ struct btrfs_ioctl_qgroup_create_args {
         __u64 create;
         __u64 qgroupid;
 };
+struct btrfs_ioctl_timespec {
+        __u64 sec;
+        __u32 nsec;
+};
+
+struct btrfs_ioctl_received_subvol_args {
+        char    uuid[BTRFS_UUID_SIZE];  /* in */
+        __u64   stransid;               /* in */
+        __u64   rtransid;               /* out */
+        struct btrfs_ioctl_timespec stime; /* in */
+        struct btrfs_ioctl_timespec rtime; /* out */
+        __u64   flags;                  /* in */
+        __u64   reserved[16];           /* in */
+};
+
+struct btrfs_ioctl_send_args {
+        __s64 send_fd;                  /* in */
+        __u64 clone_sources_count;      /* in */
+        __u64 __user *clone_sources;    /* in */
+        __u64 parent_root;              /* in */
+        __u64 flags;                    /* in */
+        __u64 reserved[4];              /* in */
+};
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
                                    struct btrfs_ioctl_vol_args)
@@ -415,6 +438,9 @@ struct btrfs_ioctl_qgroup_create_args {
                                         struct btrfs_ioctl_ino_path_args)
 #define BTRFS_IOC_LOGICAL_INO _IOWR(BTRFS_IOCTL_MAGIC, 36, \
                                         struct btrfs_ioctl_ino_path_args)
+#define BTRFS_IOC_SET_RECEIVED_SUBVOL _IOWR(BTRFS_IOCTL_MAGIC, 37, \
+                                struct btrfs_ioctl_received_subvol_args)
+#define BTRFS_IOC_SEND _IOW(BTRFS_IOCTL_MAGIC, 38, struct btrfs_ioctl_send_args)
 #define BTRFS_IOC_DEVICES_READY _IOR(BTRFS_IOCTL_MAGIC, 39, \
                                      struct btrfs_ioctl_vol_args)
 #define BTRFS_IOC_QUOTA_CTL _IOWR(BTRFS_IOCTL_MAGIC, 40, \