diff options
author | Thomas Meyer <thomas@m3y3r.de> | 2011-12-19 20:11:55 -0500 |
---|---|---|
committer | Brad Figg <brad.figg@canonical.com> | 2012-01-23 18:35:56 -0500 |
commit | 01786afcd56c11b119d5db15f14717b6742a16a9 (patch) | |
tree | 6b163bd38b834425213fd010ed79864e1a95fdbf /fs/nilfs2 | |
parent | 0c04a88aba2ec8402670dbe05e47e34bd76c488c (diff) |
nilfs2: unbreak compat ioctl
BugLink: http://bugs.launchpad.net/bugs/913373
commit 695c60f21c69e525a89279a5f35bae4ff237afbc upstream.
commit 828b1c50ae ("nilfs2: add compat ioctl") incidentally broke all
other NILFS compat ioctls. Make them work again.
Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Tested-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Brad Figg <brad.figg@canonical.com>
Diffstat (limited to 'fs/nilfs2')
-rw-r--r-- | fs/nilfs2/ioctl.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 41d6743d303..3e654273cfc 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c | |||
@@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
842 | case FS_IOC32_GETVERSION: | 842 | case FS_IOC32_GETVERSION: |
843 | cmd = FS_IOC_GETVERSION; | 843 | cmd = FS_IOC_GETVERSION; |
844 | break; | 844 | break; |
845 | case NILFS_IOCTL_CHANGE_CPMODE: | ||
846 | case NILFS_IOCTL_DELETE_CHECKPOINT: | ||
847 | case NILFS_IOCTL_GET_CPINFO: | ||
848 | case NILFS_IOCTL_GET_CPSTAT: | ||
849 | case NILFS_IOCTL_GET_SUINFO: | ||
850 | case NILFS_IOCTL_GET_SUSTAT: | ||
851 | case NILFS_IOCTL_GET_VINFO: | ||
852 | case NILFS_IOCTL_GET_BDESCS: | ||
853 | case NILFS_IOCTL_CLEAN_SEGMENTS: | ||
854 | case NILFS_IOCTL_SYNC: | ||
855 | case NILFS_IOCTL_RESIZE: | ||
856 | case NILFS_IOCTL_SET_ALLOC_RANGE: | ||
857 | break; | ||
845 | default: | 858 | default: |
846 | return -ENOIOCTLCMD; | 859 | return -ENOIOCTLCMD; |
847 | } | 860 | } |