All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kj <kernel-janitors@lists.osdl.org>, lkml <linux-kernel@vger.kernel.org>
Cc: axboe@suse.de
Subject: [KJ] [UPDATE PATCH] ide/ide-cd: use ssleep() instead of
Date: Fri, 07 Jan 2005 19:40:13 +0000	[thread overview]
Message-ID: <20050107194013.GB2924@us.ibm.com> (raw)
In-Reply-To: <20041225004846.GA19373@nd47.coderock.org>

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

On Sat, Dec 25, 2004 at 01:48:46AM +0100, Domen Puncer wrote:
> Hi.
> 
> Santa brought another present :-)
> 
> I'll start mailing new patches these days, and after external trees get
> merged, I'll be bugging you with the old ones.
> 
> 
> Patchset is at http://coderock.org/kj/2.6.10-kj/

<snip>

> msleep-drivers_ide_ide-cd.patch

Please consider updating to the following patch:

Description: Uses ssleep() in place of cdrom_sleep() to guarantee the task
delays as expected. Remove cdrom_sleep() definition, as this is the only place
where it is called.

Signed-off-by: Nishanth Aravamudan


--- 2.6.10-v/drivers/ide/ide-cd.c	2004-12-24 13:34:33.000000000 -0800
+++ 2.6.10/drivers/ide/ide-cd.c	2005-01-05 14:23:05.000000000 -0800
@@ -1520,19 +1520,6 @@ static ide_startstop_t cdrom_do_packet_c
 }
 
 
-/* Sleep for TIME jiffies.
-   Not to be called from an interrupt handler. */
-static
-void cdrom_sleep (int time)
-{
-	int sleep = time;
-
-	do {
-		set_current_state(TASK_INTERRUPTIBLE);
-		sleep = schedule_timeout(sleep);
-	} while (sleep);
-}
-
 static
 int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
 {
@@ -1567,7 +1554,7 @@ int cdrom_queue_packet_command(ide_drive
 				/* The drive is in the process of loading
 				   a disk.  Retry, but wait a little to give
 				   the drive time to complete the load. */
-				cdrom_sleep(2 * HZ);
+				ssleep(2);
 			} else {
 				/* Otherwise, don't retry. */
 				retries = 0;

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

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

WARNING: multiple messages have this Message-ID (diff)
From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kj <kernel-janitors@lists.osdl.org>, lkml <linux-kernel@vger.kernel.org>
Cc: axboe@suse.de
Subject: [UPDATE PATCH] ide/ide-cd: use ssleep() instead of schedule_timeout()
Date: Fri, 7 Jan 2005 11:40:13 -0800	[thread overview]
Message-ID: <20050107194013.GB2924@us.ibm.com> (raw)
In-Reply-To: <20041225004846.GA19373@nd47.coderock.org>

On Sat, Dec 25, 2004 at 01:48:46AM +0100, Domen Puncer wrote:
> Hi.
> 
> Santa brought another present :-)
> 
> I'll start mailing new patches these days, and after external trees get
> merged, I'll be bugging you with the old ones.
> 
> 
> Patchset is at http://coderock.org/kj/2.6.10-kj/

<snip>

> msleep-drivers_ide_ide-cd.patch

Please consider updating to the following patch:

Description: Uses ssleep() in place of cdrom_sleep() to guarantee the task
delays as expected. Remove cdrom_sleep() definition, as this is the only place
where it is called.

Signed-off-by: Nishanth Aravamudan


--- 2.6.10-v/drivers/ide/ide-cd.c	2004-12-24 13:34:33.000000000 -0800
+++ 2.6.10/drivers/ide/ide-cd.c	2005-01-05 14:23:05.000000000 -0800
@@ -1520,19 +1520,6 @@ static ide_startstop_t cdrom_do_packet_c
 }
 
 
-/* Sleep for TIME jiffies.
-   Not to be called from an interrupt handler. */
-static
-void cdrom_sleep (int time)
-{
-	int sleep = time;
-
-	do {
-		set_current_state(TASK_INTERRUPTIBLE);
-		sleep = schedule_timeout(sleep);
-	} while (sleep);
-}
-
 static
 int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
 {
@@ -1567,7 +1554,7 @@ int cdrom_queue_packet_command(ide_drive
 				/* The drive is in the process of loading
 				   a disk.  Retry, but wait a little to give
 				   the drive time to complete the load. */
-				cdrom_sleep(2 * HZ);
+				ssleep(2);
 			} else {
 				/* Otherwise, don't retry. */
 				retries = 0;

  parent reply	other threads:[~2005-01-07 19:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-12-25  0:48 [KJ] [announce] 2.6.10-kj Domen Puncer
2004-12-25  0:48 ` Domen Puncer
2005-01-07 19:33 ` [KJ] [UPDATE PATCH] atm/ambassador: use msleep() instead of Nishanth Aravamudan
2005-01-07 19:33   ` [UPDATE PATCH] atm/ambassador: use msleep() instead of schedule_timeout() Nishanth Aravamudan
2005-01-07 19:40 ` Nishanth Aravamudan [this message]
2005-01-07 19:40   ` [UPDATE PATCH] ide/ide-cd: use ssleep() " Nishanth Aravamudan
2005-01-07 19:47   ` [KJ] Re: [UPDATE PATCH] ide/ide-cd: use ssleep() instead of Jens Axboe
2005-01-07 19:47     ` [UPDATE PATCH] ide/ide-cd: use ssleep() instead of schedule_timeout() Jens Axboe
2005-01-15  0:58     ` [KJ] Re: [UPDATE PATCH] ide/ide-cd: use ssleep() instead of Bartlomiej Zolnierkiewicz
2005-01-15  0:58       ` [UPDATE PATCH] ide/ide-cd: use ssleep() instead of schedule_timeout() Bartlomiej Zolnierkiewicz
2005-01-07 21:34 ` [KJ] [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of Nishanth Aravamudan
2005-01-07 21:34   ` [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Nishanth Aravamudan
2005-01-09  9:01   ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of Stefan Richter
2005-01-09  9:01     ` [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Stefan Richter
2005-01-10 17:39     ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of Nishanth Aravamudan
2005-01-10 17:39       ` [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Nishanth Aravamudan
2005-01-14  4:52       ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of Dan Dennedy
2005-01-14  4:52         ` [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Dan Dennedy
2005-01-14 11:16         ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead Stefan Richter
2005-01-14 11:16           ` [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Stefan Richter
2005-01-19  6:27         ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of Nish Aravamudan
2005-01-19  6:27           ` [KJ] Re: [UPDATE PATCH] ieee1394/sbp2: use ssleep() instead of schedule_timeout() Nish Aravamudan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050107194013.GB2924@us.ibm.com \
    --to=nacc@us.ibm.com \
    --cc=axboe@suse.de \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.