From: James S. <jsi...@us...> - 2003-11-14 17:44:27
|
Update of /cvsroot/linuxconsole/ruby/ruby-2.6/fs In directory sc8-pr-cvs1:/tmp/cvs-serv4668/fs Modified Files: compat_ioctl.c Log Message: Syned to BK tree. Shrink the diff size. Index: compat_ioctl.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/fs/compat_ioctl.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- compat_ioctl.c 28 Oct 2003 07:17:36 -0000 1.3 +++ compat_ioctl.c 14 Nov 2003 17:44:22 -0000 1.4 @@ -1587,8 +1587,8 @@ static int do_fontx_ioctl(unsigned int fd, int cmd, struct consolefontdesc32 *user_cfd, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; struct consolefontdesc cfdarg; struct console_font_op op; int i, perm; @@ -1644,10 +1644,10 @@ static int do_kdfontop_ioctl(unsigned int fd, unsigned int cmd, struct console_font_op32 *fontop, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; - struct console_font_op op; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; int perm = vt_check(file), i; + struct console_font_op op; struct vt_struct *vt; if (perm < 0) return perm; @@ -1673,10 +1673,10 @@ static int do_unimap_ioctl(unsigned int fd, unsigned int cmd, struct unimapdesc32 *user_ud, struct file *file) { - struct tty_struct *tty = (struct tty_struct *) file->private_data; - struct vc_data *vc = (struct vc_data *) tty->driver_data; - struct unimapdesc32 tmp; + struct tty_struct *tty = (struct tty_struct *) file->private_data; + struct vc_data *vc = (struct vc_data *) tty->driver_data; int perm = vt_check(file); + struct unimapdesc32 tmp; if (perm < 0) return perm; if (copy_from_user(&tmp, user_ud, sizeof tmp)) |