On 5/9/18 12:35 PM, Randy Dunlap wrote:
> On 05/09/2018 09:01 AM, Eric Sandeen wrote:
>> Move the btrfs label ioctls up to the vfs for general use.
>>
>> This retains 256 chars as the maximum size through the interface, which
>> is the btrfs limit and AFAIK exceeds any other filesystem's maximum
>> label size.
>>
>> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
>> ---
>>
>> Let the bikeshedding on the exact ioctl name begin ;)
>>
>> fs/btrfs/ioctl.c | 8 ++++----
>> include/uapi/linux/btrfs.h | 6 ++----
>> include/uapi/linux/fs.h | 8 ++++++--
>> 3 files changed, 12 insertions(+), 10 deletions(-)
>>
>> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
>> index 632e26d..2dd4cdf 100644
>> --- a/fs/btrfs/ioctl.c
>> +++ b/fs/btrfs/ioctl.c
>> @@ -5444,6 +5444,10 @@ long btrfs_ioctl(struct file *file, unsigned int
>> return btrfs_ioctl_setflags(file, argp);
>> case FS_IOC_GETVERSION:
>> return btrfs_ioctl_getversion(file, argp);
>> + case FS_IOC_GETFSLABEL:
>> + return btrfs_ioctl_get_fslabel(file, argp);
>> + case FS_IOC_SETFSLABEL:
>> + return btrfs_ioctl_set_fslabel(file, argp);
>> case FITRIM:
>> return btrfs_ioctl_fitrim(file, argp);
>> case BTRFS_IOC_SNAP_CREATE:
>> @@ -5555,10 +5559,6 @@ long btrfs_ioctl(struct file *file, unsigned int
>> return btrfs_ioctl_quota_rescan_wait(file, argp);
>> case BTRFS_IOC_DEV_REPLACE:
>> return btrfs_ioctl_dev_replace(fs_info, argp);
>> - case BTRFS_IOC_GET_FSLABEL:
>> - return btrfs_ioctl_get_fslabel(file, argp);
>> - case BTRFS_IOC_SET_FSLABEL:
>> - return btrfs_ioctl_set_fslabel(file, argp);
>> case BTRFS_IOC_GET_SUPPORTED_FEATURES:
>> return btrfs_ioctl_get_supported_features(argp);
>> case BTRFS_IOC_GET_FEATURES:
>> diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
>> index c8d99b9..ec611c8 100644
>> --- a/include/uapi/linux/btrfs.h
>> +++ b/include/uapi/linux/btrfs.h
>> @@ -823,10 +823,8 @@ enum btrfs_err_code {
>> #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
>> struct btrfs_ioctl_quota_rescan_args)
>> #define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
>> -#define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
>> - char[BTRFS_LABEL_SIZE])
>> -#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
>> - char[BTRFS_LABEL_SIZE])
>> +#define BTRFS_IOC_GET_FSLABEL FS_IOC_GETFSLABEL
>> +#define BTRFS_IOC_SET_FSLABEL FS_IOC_SETFSLABEL
>> #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, \
>> diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h
>> index d2a8313..1df3707 100644
>> --- a/include/uapi/linux/fs.h
>> +++ b/include/uapi/linux/fs.h
>> @@ -242,6 +242,8 @@ struct fsxattr {
>> #define FICLONERANGE _IOW(0x94, 13, struct file_clone_range)
>> #define FIDEDUPERANGE _IOWR(0x94, 54, struct file_dedupe_range)
>>
>> +#define FSLABEL_MAX 256 /* Max chars for the interface; each fs may differ */
>> +
>> #define FS_IOC_GETFLAGS _IOR('f', 1, long)
>> #define FS_IOC_SETFLAGS _IOW('f', 2, long)
>> #define FS_IOC_GETVERSION _IOR('v', 1, long)
>> @@ -251,8 +253,10 @@ struct fsxattr {
>> #define FS_IOC32_SETFLAGS _IOW('f', 2, int)
>> #define FS_IOC32_GETVERSION _IOR('v', 1, int)
>> #define FS_IOC32_SETVERSION _IOW('v', 2, int)
>> -#define FS_IOC_FSGETXATTR _IOR ('X', 31, struct fsxattr)
>> -#define FS_IOC_FSSETXATTR _IOW ('X', 32, struct fsxattr)
>> +#define FS_IOC_FSGETXATTR _IOR('X', 31, struct fsxattr)
>> +#define FS_IOC_FSSETXATTR _IOW('X', 32, struct fsxattr)
>> +#define FS_IOC_GETFSLABEL _IOR(0x94, 49, char[FSLABEL_MAX])
>> +#define FS_IOC_SETFSLABEL _IOW(0x94, 50, char[FSLABEL_MAX])
>
> Also update Documentation/ioctl/ioctl-number.txt, where it says that 0x94:all
> are used for btrfs:
>
> 0x94 all fs/btrfs/ioctl.h
>
> AFAICT 0x94 is now split between vfs and btrfs. Please correct me if I
> misunderstand.
It is split, though it has been for a while now, see also:
#define FICLONE _IOW(0x94, 9, int)
#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range)
#define FIDEDUPERANGE _IOWR(0x94, 54, struct file_dedupe_range)
but sure, I can send another patch for that on the next round.
Thanks,
-Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
