Re: [PATCH] tty add compat_ioctl method

[Arnd Bergmann <arnd@arndb.de>]

On Wednesday 02 May 2007, Paul Fulghum wrote:
> Add compat_ioctl method for tty code to allow processing
> of 32 bit ioctl calls on 64 bit systems by tty core,
> tty drivers, and line disciplines.

Looks ok mostly. Just some details:

> --- a/include/linux/tty_driver.h	2006-11-29 15:57:37.000000000 -0600
> +++ b/include/linux/tty_driver.h	2007-04-30 14:05:02.000000000 -0500
> @@ -132,6 +132,10 @@ struct tty_operations {
>  	int  (*chars_in_buffer)(struct tty_struct *tty);
>  	int  (*ioctl)(struct tty_struct *tty, struct file * file,
>  		    unsigned int cmd, unsigned long arg);
> +#ifdef CONFIG_COMPAT
> +	long (*compat_ioctl)(struct tty_struct *tty, struct file * file,
> +			     unsigned int cmd, unsigned long arg);
> +#endif
>  	void (*set_termios)(struct tty_struct *tty, struct termios * old);
>  	void (*throttle)(struct tty_struct * tty);
>  	void (*unthrottle)(struct tty_struct * tty);
> @@ -193,6 +197,10 @@ struct tty_driver {
>  	int  (*chars_in_buffer)(struct tty_struct *tty);
>  	int  (*ioctl)(struct tty_struct *tty, struct file * file,
>  		    unsigned int cmd, unsigned long arg);
> +#ifdef CONFIG_COMPAT
> +	long (*compat_ioctl)(struct tty_struct *tty, struct file * file,
> +			     unsigned int cmd, unsigned long arg);
> +#endif
>  	void (*set_termios)(struct tty_struct *tty, struct termios * old);
>  	void (*throttle)(struct tty_struct * tty);
>  	void (*unthrottle)(struct tty_struct * tty);

I wouldn't hide this inside of an #ifdef. The structures are all static
and therefore a single field per driver doesn't add much bload, but
being able to always assign the .compat_ioctl pointer makes the code
somewhat nicer

> --- a/drivers/char/tty_io.c	2006-11-29 15:57:37.000000000 -0600
> +++ b/drivers/char/tty_io.c	2007-04-30 14:51:01.000000000 -0500
> @@ -151,6 +151,9 @@ static int tty_open(struct inode *, stru
>  static int tty_release(struct inode *, struct file *);
>  int tty_ioctl(struct inode * inode, struct file * file,
>  	      unsigned int cmd, unsigned long arg);
> +#ifdef CONFIG_COMPAT
> +long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg);
> +#endif
>  static int tty_fasync(int fd, struct file * filp, int on);
>  static void release_mem(struct tty_struct *tty, int idx);

declarations should never be hidden inside of an #ifdef. If you want to be
extra clever here, you can do

#ifdef CONFIG_COMPAT
long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg);
#else
#define tty_compat_ioctl NULL
#endif

then you don't need an #ifdef in the code setting the function pointers.

> @@ -3284,6 +3299,32 @@ int tty_ioctl(struct inode * inode, stru
>  	return retval;
>  }
>  
> +#ifdef CONFIG_COMPAT
> +long tty_compat_ioctl(struct file * file, unsigned int cmd, unsigned long arg)
> +{
> +	struct inode *inode = file->f_dentry->d_inode;
> +	struct tty_struct *tty;
> +	struct tty_ldisc *ld;
> +	int retval = -ENOIOCTLCMD;
> +
> +	tty = (struct tty_struct *)file->private_data;

no need for the cast, ->private_data is void*.

	Arnd <><