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

Commit 695c60f2 authored by Thomas Meyer's avatar Thomas Meyer Committed by Linus Torvalds
Browse files

nilfs2: unbreak compat ioctl 



commit 828b1c50 ("nilfs2: add compat ioctl") incidentally broke all
other NILFS compat ioctls.  Make them work again.

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Tested-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: <stable@vger.kernel.org> [3.0+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b246272e

fs/nilfs2/ioctl.c

+13 −0
Original line number Diff line number Diff line
@@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	case FS_IOC32_GETVERSION:

		cmd = FS_IOC_GETVERSION;

		break;

	case NILFS_IOCTL_CHANGE_CPMODE:

	case NILFS_IOCTL_DELETE_CHECKPOINT:

	case NILFS_IOCTL_GET_CPINFO:

	case NILFS_IOCTL_GET_CPSTAT:

	case NILFS_IOCTL_GET_SUINFO:

	case NILFS_IOCTL_GET_SUSTAT:

	case NILFS_IOCTL_GET_VINFO:

	case NILFS_IOCTL_GET_BDESCS:

	case NILFS_IOCTL_CLEAN_SEGMENTS:

	case NILFS_IOCTL_SYNC:

	case NILFS_IOCTL_RESIZE:

	case NILFS_IOCTL_SET_ALLOC_RANGE:

		break;

	default:

		return -ENOIOCTLCMD;

	}