Re: [patch 2/5] scsi_error thread exits in TASK_INTERRUPTIBLE state.

[Steven Rostedt <rostedt@goodmis.org>]

On Fri, 2005-10-28 at 17:21 -0500, James Bottomley wrote:
> On Fri, 2005-10-28 at 15:07 -0700, akpm@osdl.org wrote:
> > From: Steven Rostedt <rostedt@goodmis.org>
> > 
> > Found in the -rt patch set.  The scsi_error thread likely will be in the
> > TASK_INTERRUPTIBLE state upon exit.  This patch fixes this bug.
> > 
> > Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> > Cc: James Bottomley <James.Bottomley@steeleye.com>
> > Signed-off-by: Andrew Morton <akpm@osdl.org>
> > ---
> > 
> >  drivers/scsi/scsi_error.c |    1 +
> >  1 files changed, 1 insertion(+)
> > 
> > diff -puN drivers/scsi/scsi_error.c~scsi_error-thread-exits-in-task_interruptible-state drivers/scsi/scsi_error.c
> > --- 25/drivers/scsi/scsi_error.c~scsi_error-thread-exits-in-task_interruptible-state	Fri Oct 28 15:06:03 2005
> > +++ 25-akpm/drivers/scsi/scsi_error.c	Fri Oct 28 15:06:03 2005
> > @@ -1644,6 +1644,7 @@ int scsi_error_handler(void *data)
> >  		scsi_restart_operations(shost);
> >  		set_current_state(TASK_INTERRUPTIBLE);
> >  	}
> > +	__set_current_state(TASK_RUNNING);
> ^^^^^^^^^^^^^^^^^^^^^
> >  	__set_current_state(TASK_RUNNING);
> ^^^^^^^^^^^^^^^^^^^^^
> 
> Mismerge, I think (of a patch which is already present)

Yeah, I noticed that Linus pulled it into the 2.6.14 release, since it
was a small minor fix. So this can be dropped.

-- Steve