Patched in Tegra support.

1 files changed, 3 insertions, 254 deletions

diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h
index dabca9cc8c2..ad1ea789fcb 100644
--- a/fs/btrfs/ioctl.h
+++ b/fs/btrfs/ioctl.h
@@ -30,50 +30,17 @@ struct btrfs_ioctl_vol_args {
         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];
-        };
+        __u64 unused[4];
         char name[BTRFS_SUBVOL_NAME_MAX + 1];
 };
 
@@ -125,48 +92,7 @@ struct btrfs_ioctl_scrub_args {
         __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];
-};
-
+#define BTRFS_DEVICE_PATH_NAME_MAX 1024
 struct btrfs_ioctl_dev_info_args {
         __u64 devid;                            /* in/out */
         __u8 uuid[BTRFS_UUID_SIZE];             /* in/out */
@@ -183,55 +109,6 @@ struct btrfs_ioctl_fs_info_args {
         __u64 reserved[124];                    /* pad to 1k */
 };
 
-/* balance control ioctl modes */
-#define BTRFS_BALANCE_CTL_PAUSE         1
-#define BTRFS_BALANCE_CTL_CANCEL        2
-
-/*
- * this is packed, because it should be exactly the same as its disk
- * byte order counterpart (struct btrfs_disk_balance_args)
- */
-struct btrfs_balance_args {
-        __u64 profiles;
-        __u64 usage;
-        __u64 devid;
-        __u64 pstart;
-        __u64 pend;
-        __u64 vstart;
-        __u64 vend;
-
-        __u64 target;
-
-        __u64 flags;
-
-        __u64 unused[8];
-} __attribute__ ((__packed__));
-
-/* report balance progress to userspace */
-struct btrfs_balance_progress {
-        __u64 expected;         /* estimated # of chunks that will be
-                                 * relocated to fulfill the request */
-        __u64 considered;       /* # of chunks we have considered so far */
-        __u64 completed;        /* # of chunks relocated so far */
-};
-
-#define BTRFS_BALANCE_STATE_RUNNING     (1ULL << 0)
-#define BTRFS_BALANCE_STATE_PAUSE_REQ   (1ULL << 1)
-#define BTRFS_BALANCE_STATE_CANCEL_REQ  (1ULL << 2)
-
-struct btrfs_ioctl_balance_args {
-        __u64 flags;                            /* in/out */
-        __u64 state;                            /* out */
-
-        struct btrfs_balance_args data;         /* in/out */
-        struct btrfs_balance_args meta;         /* in/out */
-        struct btrfs_balance_args sys;          /* in/out */
-
-        struct btrfs_balance_progress stat;     /* out */
-
-        __u64 unused[72];                       /* pad to 1k */
-};
-
 #define BTRFS_INO_LOOKUP_PATH_MAX 4080
 struct btrfs_ioctl_ino_lookup_args {
         __u64 treeid;
@@ -316,105 +193,6 @@ struct btrfs_ioctl_space_args {
         struct btrfs_ioctl_space_info spaces[0];
 };
 
-struct btrfs_data_container {
-        __u32   bytes_left;     /* out -- bytes not needed to deliver output */
-        __u32   bytes_missing;  /* out -- additional bytes needed for result */
-        __u32   elem_cnt;       /* out */
-        __u32   elem_missed;    /* out */
-        __u64   val[0];         /* out */
-};
-
-struct btrfs_ioctl_ino_path_args {
-        __u64                           inum;           /* in */
-        __u64                           size;           /* in */
-        __u64                           reserved[4];
-        /* struct btrfs_data_container  *fspath;           out */
-        __u64                           fspath;         /* out */
-};
-
-struct btrfs_ioctl_logical_ino_args {
-        __u64                           logical;        /* in */
-        __u64                           size;           /* in */
-        __u64                           reserved[4];
-        /* struct btrfs_data_container  *inodes;        out   */
-        __u64                           inodes;
-};
-
-enum btrfs_dev_stat_values {
-        /* disk I/O failure stats */
-        BTRFS_DEV_STAT_WRITE_ERRS, /* EIO or EREMOTEIO from lower layers */
-        BTRFS_DEV_STAT_READ_ERRS, /* EIO or EREMOTEIO from lower layers */
-        BTRFS_DEV_STAT_FLUSH_ERRS, /* EIO or EREMOTEIO from lower layers */
-
-        /* stats for indirect indications for I/O failures */
-        BTRFS_DEV_STAT_CORRUPTION_ERRS, /* checksum error, bytenr error or
-                                         * contents is illegal: this is an
-                                         * indication that the block was damaged
-                                         * during read or write, or written to
-                                         * wrong location or read from wrong
-                                         * location */
-        BTRFS_DEV_STAT_GENERATION_ERRS, /* an indication that blocks have not
-                                         * been written */
-
-        BTRFS_DEV_STAT_VALUES_MAX
-};
-
-/* Reset statistics after reading; needs SYS_ADMIN capability */
-#define BTRFS_DEV_STATS_RESET           (1ULL << 0)
-
-struct btrfs_ioctl_get_dev_stats {
-        __u64 devid;                            /* in */
-        __u64 nr_items;                         /* in/out */
-        __u64 flags;                            /* in/out */
-
-        /* out values: */
-        __u64 values[BTRFS_DEV_STAT_VALUES_MAX];
-
-        __u64 unused[128 - 2 - BTRFS_DEV_STAT_VALUES_MAX]; /* pad to 1k */
-};
-
-#define BTRFS_QUOTA_CTL_ENABLE  1
-#define BTRFS_QUOTA_CTL_DISABLE 2
-#define BTRFS_QUOTA_CTL_RESCAN  3
-struct btrfs_ioctl_quota_ctl_args {
-        __u64 cmd;
-        __u64 status;
-};
-
-struct btrfs_ioctl_qgroup_assign_args {
-        __u64 assign;
-        __u64 src;
-        __u64 dst;
-};
-
-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)
 #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -459,9 +237,7 @@ struct btrfs_ioctl_send_args {
 #define BTRFS_IOC_WAIT_SYNC  _IOW(BTRFS_IOCTL_MAGIC, 22, __u64)
 #define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
                                    struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SUBVOL_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 24, \
-                                   struct btrfs_ioctl_vol_args_v2)
-#define BTRFS_IOC_SUBVOL_GETFLAGS _IOR(BTRFS_IOCTL_MAGIC, 25, __u64)
+#define BTRFS_IOC_SUBVOL_GETFLAGS _IOW(BTRFS_IOCTL_MAGIC, 25, __u64)
 #define BTRFS_IOC_SUBVOL_SETFLAGS _IOW(BTRFS_IOCTL_MAGIC, 26, __u64)
 #define BTRFS_IOC_SCRUB _IOWR(BTRFS_IOCTL_MAGIC, 27, \
                               struct btrfs_ioctl_scrub_args)
@@ -472,31 +248,4 @@ struct btrfs_ioctl_send_args {
                                  struct btrfs_ioctl_dev_info_args)
 #define BTRFS_IOC_FS_INFO _IOR(BTRFS_IOCTL_MAGIC, 31, \
                                struct btrfs_ioctl_fs_info_args)
-#define BTRFS_IOC_BALANCE_V2 _IOWR(BTRFS_IOCTL_MAGIC, 32, \
-                                   struct btrfs_ioctl_balance_args)
-#define BTRFS_IOC_BALANCE_CTL _IOW(BTRFS_IOCTL_MAGIC, 33, int)
-#define BTRFS_IOC_BALANCE_PROGRESS _IOR(BTRFS_IOCTL_MAGIC, 34, \
-                                        struct btrfs_ioctl_balance_args)
-#define BTRFS_IOC_INO_PATHS _IOWR(BTRFS_IOCTL_MAGIC, 35, \
-                                        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, \
-                               struct btrfs_ioctl_quota_ctl_args)
-#define BTRFS_IOC_QGROUP_ASSIGN _IOW(BTRFS_IOCTL_MAGIC, 41, \
-                               struct btrfs_ioctl_qgroup_assign_args)
-#define BTRFS_IOC_QGROUP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 42, \
-                               struct btrfs_ioctl_qgroup_create_args)
-#define BTRFS_IOC_QGROUP_LIMIT _IOR(BTRFS_IOCTL_MAGIC, 43, \
-                               struct btrfs_ioctl_qgroup_limit_args)
-#define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \
-                                      struct btrfs_ioctl_get_dev_stats)
-#define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \
-                                    struct btrfs_ioctl_dev_replace_args)
-
 #endif