diff options
| author | Chris Mason <clm@fb.com> | 2016-07-26 23:07:05 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-07-26 23:07:05 +0300 |
| commit | 023a824f04754a4ed5efc16ee8e41bb932878b0b (patch) | |
| tree | 8ae0bc5a61945bdec42d6c7a929967c548031d5d /include/uapi/linux | |
| parent | 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c (diff) | |
| parent | 66642832f06a4351e23cea6cf254967c227f8224 (diff) | |
| download | linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.xz | |
Merge branch 'kdave-v4.8' into for-linus-4.8
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/btrfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 2bdd1e3e7007..ac5eacd3055b 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -798,7 +798,7 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code) #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) + struct btrfs_ioctl_logical_ino_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) |