From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754072Ab1KNJbQ (ORCPT ); Mon, 14 Nov 2011 04:31:16 -0500 Received: from sh.osrg.net ([192.16.179.4]:35341 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753938Ab1KNJbO (ORCPT ); Mon, 14 Nov 2011 04:31:14 -0500 Date: Mon, 14 Nov 2011 18:30:47 +0900 (JST) Message-Id: <20111114.183047.139564117.ryusuke@osrg.net> To: thomas@m3y3r.de Cc: linux-kernel@vger.kernel.org, linux-nilfs@vger.kernel.org Subject: Re: [PATCH] nilfs2: unbreak compat ioctl From: Ryusuke Konishi In-Reply-To: <1321180334.1624.23.camel@localhost.localdomain> References: <1320697117.1396.4.camel@localhost.localdomain> <20111110.124918.255392182.ryusuke@osrg.net> <1321180334.1624.23.camel@localhost.localdomain> X-Mailer: Mew version 5.2 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 14 Nov 2011 18:30:48 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 13 Nov 2011 11:32:14 +0100, Thomas Meyer wrote: > Am Donnerstag, den 10.11.2011, 12:49 +0900 schrieb Ryusuke Konishi: > > But, this patch looks to prevent compat_sys_ioctl() from handling > > other compatible ioctls that compat_ioctl_check_table function > > detects. For instance, fiemap (FS_IOC_FIEMAP) is handled via the > > function. > > > > I think we should only redirect own ioctl commands > > (i.e. NILFS_IOCTL_xxxx) to the nilfs_ioctl() call. > > Hello Ryusuke, > > something like this? Thanks, it looks fine to me. I'll send it upstream after testing it against a 64-bit kernel environment with a 32-bit userspace. Regards, Ryusuke Konishi > kind regards > thomas > > From 241cc9e8c7d6b8218d307117b0d4a0dabbe1d94e Mon Sep 17 00:00:00 2001 > From: Thomas Meyer > Date: Mon, 7 Nov 2011 20:59:02 +0100 > Subject: [PATCH] nilfs2: unbreak compat ioctl > > I guess commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 incidentally broke > all other NILFS compat ioctls. make them work again. > > Signed-off-by: Thomas Meyer > --- > 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 41d6743..3e65427 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; > } > -- > 1.7.7.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/