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

Commit f3c7bfbd authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-chris' of... 

Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.10
parents 57b59ed2 2a362249

fs/btrfs/ioctl.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -5665,6 +5665,10 @@ long btrfs_ioctl(struct file *file, unsigned int 
#ifdef CONFIG_COMPAT

#ifdef CONFIG_COMPAT

long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

{

	/*

	 * These all access 32-bit values anyway so no further

	 * handling is necessary.

	 */

	switch (cmd) {

	switch (cmd) {

	case FS_IOC32_GETFLAGS:

	case FS_IOC32_GETFLAGS:

		cmd = FS_IOC_GETFLAGS;

		cmd = FS_IOC_GETFLAGS;
@@ -5675,8 +5679,6 @@ long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case FS_IOC32_GETVERSION:

	case FS_IOC32_GETVERSION:

		cmd = FS_IOC_GETVERSION;

		cmd = FS_IOC_GETVERSION;

		break;

		break;

	default:

		return -ENOIOCTLCMD;

	}

	}





	return btrfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));

	return btrfs_ioctl(file, cmd, (unsigned long) compat_ptr(arg));