[KJ] [Patch] convert schedule_timeout to msleep in cciss.c

[KJ] [Patch] convert schedule_timeout to msleep in cciss.c

[Darren Jenkins\]

G'day list

I was doing some more grepping for schedule_timeout without HZ and found
one in cciss.c.

Now I found a patch from Nish
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003637.html
that was ack'd
http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003638.html

That contained a fix, but does not seem to have been applied.

Now Nish posted another patch 
http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
that does seem to be in the KJ patch set, but doesn't fix the second
schedule_timeout().

So I figure it should either be converted to HZ relative or to msleep().
Here is a patch to do the later.

compile tested on allyesconfig.


Convert schedule_timeout to msleep in cciss.c

Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
--- drivers/block/cciss.c.orig	2006-08-29 15:31:01.000000000 +1000
+++ drivers/block/cciss.c	2006-08-29 15:41:03.000000000 +1000
@@ -2912,8 +2912,7 @@ static int cciss_pci_init(ctlr_info_t *c
 		if (!(readl(c->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq))
 			break;
 		/* delay and try again */
-		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(10);
+		msleep(100);
 	}
 
 #ifdef CCISS_DEBUG


_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [Patch] convert schedule_timeout to msleep in cciss.c

[Nishanth Aravamudan]

On 29.08.2006 [17:58:22 +1000], Darren Jenkins" wrote:
> G'day list
> 
> I was doing some more grepping for schedule_timeout without HZ and found
> one in cciss.c.
> 
> Now I found a patch from Nish

Would have been good to Cc me ;)

> http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003637.html
> that was ack'd
> http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003638.html
> 
> That contained a fix, but does not seem to have been applied.
> 
> Now Nish posted another patch 
> http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
> that does seem to be in the KJ patch set, but doesn't fix the second
> schedule_timeout().

Keep in mind, these were obviously submitted in the opposite order. The
simplest fix is for Alexey to drop the 2004-September patch and then
pick-up the Acked-by-Maintainer version from 2005-February.

Alexey, is that ok by you?

Once he responds, we can decide if your patch is necessary or not.

Thanks,
Nish

-- 
Nishanth Aravamudan <nacc@us.ibm.com>
IBM Linux Technology Center
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [Patch] convert schedule_timeout to msleep in cciss.c

[Darren Jenkins]

G'day Nish

On 8/30/06, Nishanth Aravamudan <nacc@us.ibm.com> wrote:
> On 29.08.2006 [17:58:22 +1000], Darren Jenkins" wrote:
> > G'day list
> >
> > I was doing some more grepping for schedule_timeout without HZ and found
> > one in cciss.c.
> >
> > Now I found a patch from Nish
>
> Would have been good to Cc me ;)
>
> > http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003637.html
> > that was ack'd
> > http://lists.osdl.org/mailman/htdig/kernel-janitors/2005-February/003638.html
> >
> > That contained a fix, but does not seem to have been applied.
> >
> > Now Nish posted another patch
> > http://lists.osdl.org/mailman/htdig/kernel-janitors/2004-September/001849.html
> > that does seem to be in the KJ patch set, but doesn't fix the second
> > schedule_timeout().
>
> Keep in mind, these were obviously submitted in the opposite order. The

Actually I didn't notice the reverse order thing.
It makes a lot more sense now.


> simplest fix is for Alexey to drop the 2004-September patch and then
> pick-up the Acked-by-Maintainer version from 2005-February.

Yep, either that or to get your patch upstream. It was Acked.


> Alexey, is that ok by you?
>
> Once he responds, we can decide if your patch is necessary or not.

Seems like you have it covered. :)

> Thanks,
> Nish

Darren J.
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors