From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kj <kernel-janitors@lists.osdl.org>, lkml <linux-kernel@vger.kernel.org>
Subject: [UPDATE PATCH] block/pt: replace pt_sleep() with msleep()/ssleep()
Date: Mon, 10 Jan 2005 13:18:49 -0800 [thread overview]
Message-ID: <20050110211849.GF9186@us.ibm.com> (raw)
In-Reply-To: <20050110164703.GD14307@nd47.coderock.org>
Sorry, slightly inaccurate description...
On Mon, Jan 10, 2005 at 05:47:03PM +0100, Domen Puncer wrote:
> Patchset of 171 patches is at http://coderock.org/kj/2.6.10-bk13-kj/
>
> Quick patch summary: about 30 new, 30 merged, 30 dropped.
> Seems like most external trees are merged in -linus, so i'll start
> (re)sending old patches.
<snip>
> msleep_interruptible-drivers_block_pt.patch
Please consider replacing with the following patch:
Description: Use msleep()/ssleep() instead of pt_sleep() to guarantee
the task delays as expected. TASK_INTERRUPTIBLE is used in the original code,
however there is no check on the return values / for signals, thus I believe
TASK_UNINTERRUPTIBLE (and hence msleep()) is more appropriate. Remove definition
of pt_sleep(). Change the units of the pause variable in pt_poll_dsc() to msecs,
thus allowing the use of msleep(). Appropriately modify the three callers of
pt_poll_dsc().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-v/drivers/block/paride/pt.c 2004-12-24 13:34:27.000000000 -0800
+++ 2.6.10/drivers/block/paride/pt.c 2005-01-10 12:23:43.000000000 -0800
@@ -401,12 +401,6 @@ static int pt_atapi(struct pt_unit *tape
return r;
}
-static void pt_sleep(int cs)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(cs);
-}
-
static int pt_poll_dsc(struct pt_unit *tape, int pause, int tmo, char *msg)
{
struct pi_adapter *pi = tape->pi;
@@ -416,7 +410,7 @@ static int pt_poll_dsc(struct pt_unit *t
e = 0;
s = 0;
while (k < tmo) {
- pt_sleep(pause);
+ msleep(pause);
k++;
pi_connect(pi);
write_reg(pi, 6, DRIVE(tape));
@@ -445,7 +439,7 @@ static void pt_media_access_cmd(struct p
return;
}
pi_disconnect(tape->pi);
- pt_poll_dsc(tape, HZ, tmo, fun);
+ pt_poll_dsc(tape, 1000, tmo, fun);
}
static void pt_rewind(struct pt_unit *tape)
@@ -474,11 +468,11 @@ static int pt_reset(struct pt_unit *tape
write_reg(pi, 6, DRIVE(tape));
write_reg(pi, 7, 8);
- pt_sleep(20 * HZ / 1000);
+ msleep(20);
k = 0;
while ((k++ < PT_RESET_TMO) && (status_reg(pi) & STAT_BUSY))
- pt_sleep(HZ / 10);
+ msleep(100);
flg = 1;
for (i = 0; i < 5; i++)
@@ -512,7 +506,7 @@ static int pt_ready_wait(struct pt_unit
if (!(((p & 0xffff) == 0x0402) || ((p & 0xff) == 6)))
return p;
k++;
- pt_sleep(HZ);
+ ssleep(1);
}
return 0x000020; /* timeout */
}
@@ -785,7 +779,7 @@ static ssize_t pt_read(struct file *filp
while (count > 0) {
- if (!pt_poll_dsc(tape, HZ / 100, PT_TMO, "read"))
+ if (!pt_poll_dsc(tape, 10, PT_TMO, "read"))
return -EIO;
n = count;
@@ -886,7 +880,7 @@ static ssize_t pt_write(struct file *fil
while (count > 0) {
- if (!pt_poll_dsc(tape, HZ / 100, PT_TMO, "write"))
+ if (!pt_poll_dsc(tape, 10, PT_TMO, "write"))
return -EIO;
n = count;
next prev parent reply other threads:[~2005-01-11 0:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-10 16:47 [announce] 2.6.10-bk13-kj Domen Puncer
2005-01-10 18:04 ` [KJ] " Nishanth Aravamudan
2005-01-10 18:10 ` Nishanth Aravamudan
2005-01-10 18:19 ` [UPDATE PATCH] scsi/osst: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-10 18:23 ` [UPDATE PATCH] scsi/qla1280: replace schedule_timeout() with ssleep() Nishanth Aravamudan
2005-01-10 18:23 ` [UPDATE PATCH] scsi/osst: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-10 20:08 ` [UPDATE PATCH] drivers/dmapool: use TASK_UNINTERRUPTIBLE instead of TASK_INTERRUPTIBLE Nishanth Aravamudan
2005-01-10 20:13 ` [KJ] [announce] 2.6.10-bk13-kj Nishanth Aravamudan
2005-01-10 21:14 ` Nishanth Aravamudan
2005-01-10 21:15 ` [UPDATE PATCH] block/pf: replace pf_sleep() with msleep() Nishanth Aravamudan
2005-01-10 21:16 ` [UPDATE PATCH] block/pcd: replace pcd_sleep() with msleep()/ssleep() Nishanth Aravamudan
2005-01-10 21:18 ` Nishanth Aravamudan [this message]
2005-01-10 21:20 ` [UPDATE PATCH] block/pg: replace pg_sleep() with msleep() Nishanth Aravamudan
2005-01-10 21:27 ` [UPDATE PATCH] cdrom/sonycd535: replace schedule_timeout() " Nishanth Aravamudan
2005-01-10 23:12 ` [UPDATE PATCH] message/mptbase: replace schedule_timeout() with ssleep() Nishanth Aravamudan
2005-01-11 0:39 ` [UPDATE PATCH] net/sb1000: replace nicedelay() " Nishanth Aravamudan
2005-01-11 3:56 ` Jeff Garzik
2005-01-11 4:10 ` [KJ] " Nish Aravamudan
2005-01-11 0:42 ` [UPDATE PATCH] net/slip: replace schedule_timeout() with msleep() Nishanth Aravamudan
2005-01-11 0:56 ` [UPDATE PATCH] sbus/envctrl: replace schedule_timeout() with msleep_interruptible() Nishanth Aravamudan
2005-01-11 1:00 ` [UPDATE PATCH] scsi/st: " Nishanth 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=20050110211849.GF9186@us.ibm.com \
--to=nacc@us.ibm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).