diff options
| author | Thomas Meyer <thomas@m3y3r.de> | 2011-12-19 17:11:55 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 10:25:04 -0800 | 
| commit | 695c60f21c69e525a89279a5f35bae4ff237afbc (patch) | |
| tree | ff706db0f49c246a398d1bbb0fc0336a43334dd1 | |
| parent | b246272ecc5ac68c743b15c9e41a2275f7ce70e2 (diff) | |
nilfs2: unbreak compat ioctl
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>
Cc: <stable@vger.kernel.org> [3.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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 41d6743d303c..3e654273cfc2 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)  	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;  	} | 
