[PATCH]: Remove bogons from the iSeries console

[PATCH]: Remove bogons from the iSeries console

[Alan Cox]

The iSeries driver calls into the n_tty ldisc code directly for some
bizarre reason. I previously tagged this with a query but this actually
does need fixing as n_tty methods when you have a different ldisc set are
not a good thing to call.

In n_tty mode this change should have no effect, the core tty layer has
always called the ldisc ioctl method *anyway* and will call the one for
the right ldisc.

Signed-off-by: Alan Cox <alan@redhat.com>

---

 drivers/char/viocons.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)


diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 65fb848..f48892b 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -705,10 +705,6 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
 	case KDSKBLED:
 		return 0;
 	}
-	/* FIXME: WTF is this being called for ??? */
-	lock_kernel();
-	ret =  n_tty_ioctl(tty, file, cmd, arg);
-	unlock_kernel();
 	return ret;
 }
 

Re: [PATCH]: Remove bogons from the iSeries console

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 909 bytes --]

Hi Alan,

On Wed, 6 Aug 2008 14:06:29 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> The iSeries driver calls into the n_tty ldisc code directly for some
> bizarre reason. I previously tagged this with a query but this actually
> does need fixing as n_tty methods when you have a different ldisc set are
> not a good thing to call.
> 
> In n_tty mode this change should have no effect, the core tty layer has
> always called the ldisc ioctl method *anyway* and will call the one for
> the right ldisc.
> 
> Signed-off-by: Alan Cox <alan@redhat.com>

I will take your word for it as I have no idea.  This driver needs to be
deprecated anyway (in favour of hcv_iseries).

You may consider this
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
as defacto iSeries maintainer.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH]: Remove bogons from the iSeries console

[Adrian Bunk]

On Thu, Aug 07, 2008 at 12:10:06AM +1000, Stephen Rothwell wrote:
> Hi Alan,
> 
> On Wed, 6 Aug 2008 14:06:29 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >
> > The iSeries driver calls into the n_tty ldisc code directly for some
> > bizarre reason. I previously tagged this with a query but this actually
> > does need fixing as n_tty methods when you have a different ldisc set are
> > not a good thing to call.
> > 
> > In n_tty mode this change should have no effect, the core tty layer has
> > always called the ldisc ioctl method *anyway* and will call the one for
> > the right ldisc.
> > 
> > Signed-off-by: Alan Cox <alan@redhat.com>
> 
> I will take your word for it as I have no idea.  This driver needs to be
> deprecated anyway (in favour of hcv_iseries).
>...

You already marked it as "Obsolete" more than 2 years ago, and due the 
kconfig dependencies most people anyway won't even see the option (since 
they have HVC_ISERIES enabled).

IMHO a candidate for a straight removal?

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [PATCH]: Remove bogons from the iSeries console

[Alan Cox]

On Thu, 7 Aug 2008 09:43:28 +1000
Paul Mackerras <paulus@samba.org> wrote:

> Alan Cox writes:
> 
> > --- a/drivers/char/viocons.c
> > +++ b/drivers/char/viocons.c
> > @@ -705,10 +705,6 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
> >  	case KDSKBLED:
> >  		return 0;
> >  	}
> > -	/* FIXME: WTF is this being called for ??? */
> > -	lock_kernel();
> > -	ret =  n_tty_ioctl(tty, file, cmd, arg);
> > -	unlock_kernel();
> >  	return ret;
> >  }
> 
> I think you want "return -ENOIOCTLCMD" rather than "return ret" since
> ret is uninitialized with your patch applied.  I agree the call to
> n_tty_ioctl is bogus but I think we just want to return -ENOIOCTLCMD.

Agreed

Re: [PATCH]: Remove bogons from the iSeries console

[Paul Mackerras]

Alan Cox writes:

> --- a/drivers/char/viocons.c
> +++ b/drivers/char/viocons.c
> @@ -705,10 +705,6 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
>  	case KDSKBLED:
>  		return 0;
>  	}
> -	/* FIXME: WTF is this being called for ??? */
> -	lock_kernel();
> -	ret =  n_tty_ioctl(tty, file, cmd, arg);
> -	unlock_kernel();
>  	return ret;
>  }

I think you want "return -ENOIOCTLCMD" rather than "return ret" since
ret is uninitialized with your patch applied.  I agree the call to
n_tty_ioctl is bogus but I think we just want to return -ENOIOCTLCMD.

Paul.

Re: [PATCH]: Remove bogons from the iSeries console

[Linus Torvalds]

On Thu, 7 Aug 2008, Paul Mackerras wrote:
> 
> I think you want "return -ENOIOCTLCMD" rather than "return ret" since
> ret is uninitialized with your patch applied.

Actually, nobody has apparently ever even tried compiling that function 
even before. 

Yes, 'ret' became uninitialized, but since it was never declared, it 
doesn't matter - it wouldn't compile anyway.

> I agree the call to n_tty_ioctl is bogus but I think we just want to 
> return -ENOIOCTLCMD.

I made that change, and in the spirit of that file I also didn't even try 
to compile it. So if the end result sexually assaults your pets, don't 
blame me. 

			Linus