* Re: [PATCH] nilfs2: unbreak compat ioctl [not found] ` <1320697117.1396.4.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org> @ 2011-11-10 3:49 ` Ryusuke Konishi [not found] ` <20111110.124918.255392182.ryusuke-sG5X7nlA6pw@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Ryusuke Konishi @ 2011-11-10 3:49 UTC (permalink / raw) To: thomas-VsYtu1Qij5c Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-nilfs-u79uwXL29TY76Z2rM5mHXA On Mon, 07 Nov 2011 21:18:37 +0100, Thomas Meyer wrote: > I guess commit 828b1c50ae11e6dda68f8dfefe43b74c7182b157 incidentally broke > all other compat ioctls. make them work again. > > Signed-off-by: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org> > --- > fs/nilfs2/ioctl.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c > index 41d6743..1773a98 100644 > --- a/fs/nilfs2/ioctl.c > +++ b/fs/nilfs2/ioctl.c > @@ -842,8 +842,6 @@ long nilfs_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) > case FS_IOC32_GETVERSION: > cmd = FS_IOC_GETVERSION; > break; > - default: > - return -ENOIOCTLCMD; > } > return nilfs_ioctl(filp, cmd, (unsigned long)compat_ptr(arg)); > } > -- > 1.7.7 Hi, thank you for pointing this out. 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. Regards, Ryusuke Konishi -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <20111110.124918.255392182.ryusuke-sG5X7nlA6pw@public.gmane.org>]
* Re: [PATCH] nilfs2: unbreak compat ioctl [not found] ` <20111110.124918.255392182.ryusuke-sG5X7nlA6pw@public.gmane.org> @ 2011-11-13 10:32 ` Thomas Meyer [not found] ` <1321180334.1624.23.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Thomas Meyer @ 2011-11-13 10:32 UTC (permalink / raw) To: Ryusuke Konishi Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-nilfs-u79uwXL29TY76Z2rM5mHXA 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? kind regards thomas From 241cc9e8c7d6b8218d307117b0d4a0dabbe1d94e Mon Sep 17 00:00:00 2001 From: Thomas Meyer <thomas-VsYtu1Qij5c@public.gmane.org> 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 <thomas-VsYtu1Qij5c@public.gmane.org> --- 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-nilfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <1321180334.1624.23.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>]
* Re: [PATCH] nilfs2: unbreak compat ioctl [not found] ` <1321180334.1624.23.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org> @ 2011-11-14 9:30 ` Ryusuke Konishi 0 siblings, 0 replies; 3+ messages in thread From: Ryusuke Konishi @ 2011-11-14 9:30 UTC (permalink / raw) To: thomas-VsYtu1Qij5c Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-nilfs-u79uwXL29TY76Z2rM5mHXA 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 <thomas-VsYtu1Qij5c@public.gmane.org> > 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 <thomas-VsYtu1Qij5c@public.gmane.org> > --- > 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-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-14 9:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1320697117.1396.4.camel@localhost.localdomain>
[not found] ` <1320697117.1396.4.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2011-11-10 3:49 ` [PATCH] nilfs2: unbreak compat ioctl Ryusuke Konishi
[not found] ` <20111110.124918.255392182.ryusuke-sG5X7nlA6pw@public.gmane.org>
2011-11-13 10:32 ` Thomas Meyer
[not found] ` <1321180334.1624.23.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2011-11-14 9:30 ` Ryusuke Konishi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).