Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9

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

Conflicts:
	fs/btrfs/disk-io.c

2 files changed, 515 insertions, 0 deletions

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 4e67194fd2c3..5c8a1d25e21c 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -68,6 +68,7 @@ header-y += blkpg.h
 header-y += blktrace_api.h
 header-y += bpqether.h
 header-y += bsg.h
+header-y += btrfs.h
 header-y += can.h
 header-y += capability.h
 header-y += capi.h
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
new file mode 100644
index 000000000000..fa3a5f9338fc
--- /dev/null
+++ b/include/uapi/linux/btrfs.h
@@ -0,0 +1,514 @@
+/*
+ * Copyright (C) 2007 Oracle.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#ifndef _UAPI_LINUX_BTRFS_H
+#define _UAPI_LINUX_BTRFS_H
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define BTRFS_IOCTL_MAGIC 0x94
+#define BTRFS_VOL_NAME_MAX 255
+
+/* this should be 4k */
+#define BTRFS_PATH_NAME_MAX 4087
+struct btrfs_ioctl_vol_args {
+        __s64 fd;
+        char name[BTRFS_PATH_NAME_MAX + 1];
+};
+
+#define BTRFS_DEVICE_PATH_NAME_MAX 1024
+
+#define BTRFS_SUBVOL_CREATE_ASYNC       (1ULL << 0)
+#define BTRFS_SUBVOL_RDONLY             (1ULL << 1)
+#define BTRFS_SUBVOL_QGROUP_INHERIT     (1ULL << 2)
+#define BTRFS_FSID_SIZE 16
+#define BTRFS_UUID_SIZE 16
+
+#define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0)
+
+struct btrfs_qgroup_limit {
+        __u64   flags;
+        __u64   max_rfer;
+        __u64   max_excl;
+        __u64   rsv_rfer;
+        __u64   rsv_excl;
+};
+
+struct btrfs_qgroup_inherit {
+        __u64   flags;
+        __u64   num_qgroups;
+        __u64   num_ref_copies;
+        __u64   num_excl_copies;
+        struct btrfs_qgroup_limit lim;
+        __u64   qgroups[0];
+};
+
+struct btrfs_ioctl_qgroup_limit_args {
+        __u64   qgroupid;
+        struct btrfs_qgroup_limit lim;
+};
+
+#define BTRFS_SUBVOL_NAME_MAX 4039
+struct btrfs_ioctl_vol_args_v2 {
+        __s64 fd;
+        __u64 transid;
+        __u64 flags;
+        union {
+                struct {
+                        __u64 size;
+                        struct btrfs_qgroup_inherit __user *qgroup_inherit;
+                };
+                __u64 unused[4];
+        };
+        char name[BTRFS_SUBVOL_NAME_MAX + 1];
+};
+
+/*
+ * structure to report errors and progress to userspace, either as a
+ * result of a finished scrub, a canceled scrub or a progress inquiry
+ */
+struct btrfs_scrub_progress {
+        __u64 data_extents_scrubbed;    /* # of data extents scrubbed */
+        __u64 tree_extents_scrubbed;    /* # of tree extents scrubbed */
+        __u64 data_bytes_scrubbed;      /* # of data bytes scrubbed */
+        __u64 tree_bytes_scrubbed;      /* # of tree bytes scrubbed */
+        __u64 read_errors;              /* # of read errors encountered (EIO) */
+        __u64 csum_errors;              /* # of failed csum checks */
+        __u64 verify_errors;            /* # of occurences, where the metadata
+                                         * of a tree block did not match the
+                                         * expected values, like generation or
+                                         * logical */
+        __u64 no_csum;                  /* # of 4k data block for which no csum
+                                         * is present, probably the result of
+                                         * data written with nodatasum */
+        __u64 csum_discards;            /* # of csum for which no data was found
+                                         * in the extent tree. */
+        __u64 super_errors;             /* # of bad super blocks encountered */
+        __u64 malloc_errors;            /* # of internal kmalloc errors. These
+                                         * will likely cause an incomplete
+                                         * scrub */
+        __u64 uncorrectable_errors;     /* # of errors where either no intact
+                                         * copy was found or the writeback
+                                         * failed */
+        __u64 corrected_errors;         /* # of errors corrected */
+        __u64 last_physical;            /* last physical address scrubbed. In
+                                         * case a scrub was aborted, this can
+                                         * be used to restart the scrub */
+        __u64 unverified_errors;        /* # of occurences where a read for a
+                                         * full (64k) bio failed, but the re-
+                                         * check succeeded for each 4k piece.
+                                         * Intermittent error. */
+};
+
+#define BTRFS_SCRUB_READONLY    1
+struct btrfs_ioctl_scrub_args {
+        __u64 devid;                            /* in */
+        __u64 start;                            /* in */
+        __u64 end;                              /* in */
+        __u64 flags;                            /* in */
+        struct btrfs_scrub_progress progress;   /* out */
+        /* pad to 1k */
+        __u64 unused[(1024-32-sizeof(struct btrfs_scrub_progress))/8];
+};
+
+#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_ALWAYS    0
+#define BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_AVOID     1
+struct btrfs_ioctl_dev_replace_start_params {
+        __u64 srcdevid; /* in, if 0, use srcdev_name instead */
+        __u64 cont_reading_from_srcdev_mode;    /* in, see #define
+                                                 * above */
+        __u8 srcdev_name[BTRFS_DEVICE_PATH_NAME_MAX + 1];       /* in */
+        __u8 tgtdev_name[BTRFS_DEVICE_PATH_NAME_MAX + 1];       /* in */
+};
+
+#define BTRFS_IOCTL_DEV_REPLACE_STATE_NEVER_STARTED     0
+#define BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED           1
+#define BTRFS_IOCTL_DEV_REPLACE_STATE_FINISHED          2
+#define BTRFS_IOCTL_DEV_REPLACE_STATE_CANCELED          3
+#define BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED         4
+struct btrfs_ioctl_dev_replace_status_params {
+        __u64 replace_state;    /* out, see #define above */
+        __u64 progress_1000;    /* out, 0 <= x <= 1000 */
+        __u64 time_started;     /* out, seconds since 1-Jan-1970 */
+        __u64 time_stopped;     /* out, seconds since 1-Jan-1970 */
+        __u64 num_write_errors; /* out */
+        __u64 num_uncorrectable_read_errors;    /* out */
+};
+
+#define BTRFS_IOCTL_DEV_REPLACE_CMD_START                       0
+#define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS                      1
+#define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL                      2
+#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR                 0
+#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED              1
+#define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED          2
+struct btrfs_ioctl_dev_replace_args {
+        __u64 cmd;      /* in */
+        __u64 result;   /* out */
+
+        union {
+                struct btrfs_ioctl_dev_replace_start_params start;
+                struct btrfs_ioctl_dev_replace_status_params status;
+        };      /* in/out */
+
+        __u64 spare[64];
+};
+
+struct btrfs_ioctl_dev_info_args {
+        __u64 devid;                            /* in/out */
+        __u8 uuid[BTRFS_UUID_SIZE];             /* in/out */
+        __u64 bytes_used;                       /* out */
+        __u64 total_bytes;                      /* out */