Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40cf931f authored by Eric Sandeen's avatar Eric Sandeen Committed by David Sterba
Browse files

btrfs: use common vfs LABEL ioctl definitions 



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.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5044ed4f

fs/btrfs/ioctl.c

+4 −4
Original line number Diff line number Diff line
@@ -5453,6 +5453,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:
@@ -5564,10 +5568,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:

include/uapi/linux/btrfs.h

+2 −4
Original line number Diff line number Diff line
@@ -917,10 +917,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, \