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

Commit d5131b65 authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop unused argument in btrfs_ioctl_get_supported_features 



Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c5868f83

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -4089,7 +4089,7 @@ void btrfs_test_inode_set_ops(struct inode *inode); 


/* ioctl.c */

long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg);

int btrfs_ioctl_get_supported_features(void __user *arg);

void btrfs_update_iflags(struct inode *inode);

void btrfs_inherit_iflags(struct inode *inode, struct inode *dir);

int btrfs_is_empty_uuid(u8 *uuid);

fs/btrfs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -5187,7 +5187,7 @@ static int btrfs_ioctl_set_fslabel(struct file *file, void __user *arg) 
	  .compat_ro_flags = BTRFS_FEATURE_COMPAT_RO_##suffix, \

	  .incompat_flags = BTRFS_FEATURE_INCOMPAT_##suffix }



int btrfs_ioctl_get_supported_features(struct file *file, void __user *arg)

int btrfs_ioctl_get_supported_features(void __user *arg)

{

	static const struct btrfs_ioctl_feature_flags features[3] = {

		INIT_FEATURE_FLAGS(SUPP),
@@ -5466,7 +5466,7 @@ long btrfs_ioctl(struct file *file, unsigned int 
	case BTRFS_IOC_SET_FSLABEL:

		return btrfs_ioctl_set_fslabel(file, argp);

	case BTRFS_IOC_GET_SUPPORTED_FEATURES:

		return btrfs_ioctl_get_supported_features(file, argp);

		return btrfs_ioctl_get_supported_features(argp);

	case BTRFS_IOC_GET_FEATURES:

		return btrfs_ioctl_get_features(file, argp);

	case BTRFS_IOC_SET_FEATURES:

fs/btrfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -2164,8 +2164,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, 
		ret = !(fs_devices->num_devices == fs_devices->total_devices);

		break;

	case BTRFS_IOC_GET_SUPPORTED_FEATURES:

		ret = btrfs_ioctl_get_supported_features(NULL,

				(void __user*)arg);

		ret = btrfs_ioctl_get_supported_features((void __user*)arg);

		break;

	}