I lifted the btrfs label get/set ioctls to the vfs some time ago, but never followed up to use those common definitions directly in btrfs. This patch does that.
Showing the changes to include/uapi/linux (1 of 2 files). Show all
Unified · Split
| @@ -917,10 +917,8 @@ enum btrfs_err_code { · 916 unmodified lines | |||
| 917 | #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \ | 917 | #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \ |
| 918 | struct btrfs_ioctl_quota_rescan_args) | 918 | struct btrfs_ioctl_quota_rescan_args) |
| 919 | #define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) | 919 | #define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) |
| 920 | #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \ | 920 | #define BTRFS_IOC_GET_FSLABEL FS_IOC_GETFSLABEL |
| 921 | char[BTRFS_LABEL_SIZE]) | 921 | #define BTRFS_IOC_SET_FSLABEL FS_IOC_SETFSLABEL |
| 922 | #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \ | ||
| 923 | char[BTRFS_LABEL_SIZE]) | ||
| 924 | #define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \ | 922 | #define BTRFS_IOC_GET_DEV_STATS _IOWR(BTRFS_IOCTL_MAGIC, 52, \ |
| 925 | struct btrfs_ioctl_get_dev_stats) | 923 | struct btrfs_ioctl_get_dev_stats) |
| 926 | #define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \ | 924 | #define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \ |