[30/75] nilfs2: unbreak compat ioctl
From: Greg KH <gregkh@suse.de>
Date: 2012-01-03 22:41:44
Also in:
lkml
3.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Meyer <redacted>
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 <redacted>
Signed-off-by: Ryusuke Konishi <redacted>
Tested-by: Ryusuke Konishi <redacted>
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>
---
fs/nilfs2/ioctl.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c@@ -842,6 +842,19 @@ long nilfs_compat_ioctl(struct file *fil 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; }