diff options
| author | Chris Mason <clm@fb.com> | 2016-06-08 14:36:12 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-06-08 14:36:12 -0700 |
| commit | 719da39a61173c849f70656ed1a302e4b6deaa5b (patch) | |
| tree | dcba3abd4921cdc663eb0fbad0c7e62fbe73f27c /include | |
| parent | 4c52990080e37925039a4d546937e9df2a8da944 (diff) | |
| parent | 5f9e1059d9347191b271bf7d13bd83db57594d2a (diff) | |
| download | linux-719da39a61173c849f70656ed1a302e4b6deaa5b.tar.bz2 | |
Merge branch 'misc-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'include')
| -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 23c6960e94a4..2bdd1e3e7007 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { }; union { char name[BTRFS_SUBVOL_NAME_MAX + 1]; - u64 devid; + __u64 devid; }; }; |