From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 7/16] scsi/osst: replace
Date: Mon, 27 Sep 2004 18:21:58 +0000 [thread overview]
Message-ID: <20040927182158.GV1676@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2502 bytes --]
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of
schedule_timeout() to guarantee the task delays as expected.
--- 2.6.9-rc2-vanilla/drivers/scsi/osst.c 2004-09-13 17:16:00.000000000 -0700
+++ 2.6.9-rc2/drivers/scsi/osst.c 2004-09-14 09:13:28.000000000 -0700
@@ -614,8 +614,7 @@ static int osst_wait_ready(OS_Scsi_Tape
#endif
if (initial_delay > 0) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(initial_delay);
+ msleep_interruptible(jiffies_to_msecs(initial_delay));
}
memset(cmd, 0, MAX_COMMAND_SIZE);
@@ -637,8 +636,7 @@ static int osst_wait_ready(OS_Scsi_Tape
debugging = 0;
}
#endif
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
+ msleep_interruptible(100);
memset(cmd, 0, MAX_COMMAND_SIZE);
cmd[0] = TEST_UNIT_READY;
@@ -697,8 +695,7 @@ static int osst_wait_for_medium(OS_Scsi_
debugging = 0;
}
#endif
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
+ msleep_interruptible(100);
memset(cmd, 0, MAX_COMMAND_SIZE);
cmd[0] = TEST_UNIT_READY;
@@ -818,8 +815,7 @@ static int osst_wait_frame(OS_Scsi_Tape
notyetprinted--;
}
#endif
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout (HZ / OSST_POLL_PER_SEC);
+ msleep_interruptible(1000 / OSST_POLL_PER_SEC);
}
#if DEBUG
printk (OSST_DEB_MSG "%s:D: Fail wait f fr %i (>%i): %i-%i %i: %3li.%li s\n",
@@ -1420,8 +1416,7 @@ static int osst_read_back_buffer_and_rew
if (SRpnt->sr_sense_buffer[2] == 2 && SRpnt->sr_sense_buffer[12] == 4 &&
(SRpnt->sr_sense_buffer[13] == 1 || SRpnt->sr_sense_buffer[13] == 8)) {
/* in the process of becoming ready */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
+ msleep_interruptible(100);
continue;
}
if (STp->buffer->syscall_result)
@@ -1493,8 +1488,7 @@ static int osst_reposition_and_retry(OS_
osst_set_frame_position(STp, aSRpnt, frame + skip, 1);
flag = 0;
attempts--;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
+ msleep_interruptible(100);
}
if (osst_get_frame_position(STp, aSRpnt) < 0) { /* additional write error */
#if DEBUG
@@ -1555,7 +1549,7 @@ static int osst_reposition_and_retry(OS_
debugging = 0;
}
#endif
- schedule_timeout(HZ / 10);
+ msleep_interruptible(100);
}
printk(KERN_ERR "%s:E: Failed to find valid tape media\n", name);
#if DEBUG
[-- 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
reply other threads:[~2004-09-27 18:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20040927182158.GV1676@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=kernel-janitors@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.