diff options
author | Palmer Dabbelt <palmer@dabbelt.com> | 2016-01-20 11:35:52 -0800 |
---|---|---|
committer | Palmer Dabbelt <palmer@dabbelt.com> | 2016-01-20 11:37:32 -0800 |
commit | 680995ac4be045826d2050f9105c70a10db4a66f (patch) | |
tree | 5b6d65ad6fb86c6d3210bd869ceb5c2456d05d11 /linux-headers/include/linux/btrfs.h | |
parent | 728afcddcb0526a0f6560c4032da82805f054d58 (diff) | |
download | riscv-gnu-toolchain-680995ac4be045826d2050f9105c70a10db4a66f.zip riscv-gnu-toolchain-680995ac4be045826d2050f9105c70a10db4a66f.tar.gz riscv-gnu-toolchain-680995ac4be045826d2050f9105c70a10db4a66f.tar.bz2 |
Bump linux-headers
These are cached from riscv-linux and have gotten out of date. The
breaking change was in asm/ptrace.h, but riscv-linux also got bumped so
this is a big commit.
This syncs from e1c1614e7bd2e053e88d0cb875e1a22b27df6e39 in riscv-linux.
Diffstat (limited to 'linux-headers/include/linux/btrfs.h')
-rw-r--r-- | linux-headers/include/linux/btrfs.h | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/linux-headers/include/linux/btrfs.h b/linux-headers/include/linux/btrfs.h index 11556e2..5621d33 100644 --- a/linux-headers/include/linux/btrfs.h +++ b/linux-headers/include/linux/btrfs.h @@ -38,6 +38,7 @@ struct btrfs_ioctl_vol_args { #define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2) #define BTRFS_FSID_SIZE 16 #define BTRFS_UUID_SIZE 16 +#define BTRFS_UUID_UNPARSED_SIZE 37 #define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0) @@ -156,6 +157,7 @@ struct btrfs_ioctl_dev_replace_status_params { #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 +#define BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS 3 struct btrfs_ioctl_dev_replace_args { __u64 cmd; /* in */ __u64 result; /* out */ @@ -181,7 +183,11 @@ struct btrfs_ioctl_fs_info_args { __u64 max_id; /* out */ __u64 num_devices; /* out */ __u8 fsid[BTRFS_FSID_SIZE]; /* out */ - __u64 reserved[124]; /* pad to 1k */ + __u32 nodesize; /* out */ + __u32 sectorsize; /* out */ + __u32 clone_alignment; /* out */ + __u32 reserved32; + __u64 reserved[122]; /* pad to 1k */ }; struct btrfs_ioctl_feature_flags { @@ -211,7 +217,8 @@ struct btrfs_balance_args { __u64 flags; - __u64 unused[8]; + __u64 limit; /* limit number of processed chunks */ + __u64 unused[7]; } __attribute__ ((__packed__)); /* report balance progress to userspace */ @@ -301,6 +308,14 @@ struct btrfs_ioctl_search_args { char buf[BTRFS_SEARCH_ARGS_BUFSIZE]; }; +struct btrfs_ioctl_search_args_v2 { + struct btrfs_ioctl_search_key key; /* in/out - search parameters */ + __u64 buf_size; /* in - size of buffer + * out - on EOVERFLOW: needed size + * to store item */ + __u64 buf[0]; /* out - found items */ +}; + struct btrfs_ioctl_clone_range_args { __s64 src_fd; __u64 src_offset, src_length; @@ -480,8 +495,7 @@ struct btrfs_ioctl_send_args { /* Error codes as returned by the kernel */ enum btrfs_err_code { - notused, - BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET, + BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET = 1, BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET, BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET, BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET, @@ -553,6 +567,8 @@ static __inline__ char *btrfs_err_str(enum btrfs_err_code err_code) struct btrfs_ioctl_defrag_range_args) #define BTRFS_IOC_TREE_SEARCH _IOWR(BTRFS_IOCTL_MAGIC, 17, \ struct btrfs_ioctl_search_args) +#define BTRFS_IOC_TREE_SEARCH_V2 _IOWR(BTRFS_IOCTL_MAGIC, 17, \ + struct btrfs_ioctl_search_args_v2) #define BTRFS_IOC_INO_LOOKUP _IOWR(BTRFS_IOCTL_MAGIC, 18, \ struct btrfs_ioctl_ino_lookup_args) #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, __u64) |