From: Nishanth Aravamudan <nacc@us.ibm.com>
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size. Also use
human-time conversion functions instead of hard-coded division to avoid
rounding issues.
(akpm: this patch relies on other stuff in -mm, please don't apply)
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
net/core/pktgen.c | 13 +++++--------
net/ipv4/ipconfig.c | 5 ++---
net/irda/ircomm/ircomm_tty.c | 9 +++------
net/sunrpc/svcsock.c | 3 +--
4 files changed, 11 insertions(+), 19 deletions(-)
diff -puN net/core/pktgen.c~net-fix-up-schedule_timeout-usage net/core/pktgen.c
--- devel/net/core/pktgen.c~net-fix-up-schedule_timeout-usage 2005-08-30 18:46:21.000000000 -0700
+++ devel-akpm/net/core/pktgen.c 2005-08-30 18:46:21.000000000 -0700
@@ -1452,8 +1452,7 @@ static int proc_thread_write(struct file
thread_lock();
t->control |= T_REMDEV;
thread_unlock();
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ/8); /* Propagate thread->control */
+ schedule_timeout_interruptible(msecs_to_jiffies(125)); /* Propagate thread->control */
ret = count;
sprintf(pg_result, "OK: rem_device_all");
goto out;
@@ -1716,10 +1715,9 @@ static void spin(struct pktgen_dev *pkt_
printk(KERN_INFO "sleeping for %d\n", (int)(spin_until_us - now));
while (now < spin_until_us) {
/* TODO: optimise sleeping behavior */
- if (spin_until_us - now > (1000000/HZ)+1) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(1);
- } else if (spin_until_us - now > 100) {
+ if (spin_until_us - now > jiffies_to_usecs(1)+1)
+ schedule_timeout_interruptible(1);
+ else if (spin_until_us - now > 100) {
do_softirq();
if (!pkt_dev->running)
return;
@@ -2449,8 +2447,7 @@ static void pktgen_run_all_threads(void)
}
thread_unlock();
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ/8); /* Propagate thread->control */
+ schedule_timeout_interruptible(msecs_to_jiffies(125)); /* Propagate thread->control */
pktgen_wait_all_threads_run();
}
diff -puN net/ipv4/ipconfig.c~net-fix-up-schedule_timeout-usage net/ipv4/ipconfig.c
--- devel/net/ipv4/ipconfig.c~net-fix-up-schedule_timeout-usage 2005-08-30 18:46:21.000000000 -0700
+++ devel-akpm/net/ipv4/ipconfig.c 2005-08-30 18:46:21.000000000 -0700
@@ -1102,10 +1102,9 @@ static int __init ic_dynamic(void)
#endif
jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout);
- while (time_before(jiffies, jiff) && !ic_got_reply) {
+ while (time_before(jiffies, jiff) && !ic_got_reply)
set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
- }
+ schedule_timeout_uninterruptible(1);
#ifdef IPCONFIG_DHCP
/* DHCP isn't done until we get a DHCPACK. */
if ((ic_got_reply & IC_BOOTP)
diff -puN net/irda/ircomm/ircomm_tty.c~net-fix-up-schedule_timeout-usage net/irda/ircomm/ircomm_tty.c
--- devel/net/irda/ircomm/ircomm_tty.c~net-fix-up-schedule_timeout-usage 2005-08-30 18:46:21.000000000 -0700
+++ devel-akpm/net/irda/ircomm/ircomm_tty.c 2005-08-30 18:46:21.000000000 -0700
@@ -567,10 +567,8 @@ static void ircomm_tty_close(struct tty_
self->tty = NULL;
if (self->blocked_open) {
- if (self->close_delay) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(self->close_delay);
- }
+ if (self->close_delay)
+ schedule_timeout_interruptible(self->close_delay);
wake_up_interruptible(&self->open_wait);
}
@@ -863,8 +861,7 @@ static void ircomm_tty_wait_until_sent(s
spin_lock_irqsave(&self->spinlock, flags);
while (self->tx_skb && self->tx_skb->len) {
spin_unlock_irqrestore(&self->spinlock, flags);
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(poll_time);
+ schedule_timeout_interruptible(poll_time);
spin_lock_irqsave(&self->spinlock, flags);
if (signal_pending(current))
break;
diff -puN net/sunrpc/svcsock.c~net-fix-up-schedule_timeout-usage net/sunrpc/svcsock.c
--- devel/net/sunrpc/svcsock.c~net-fix-up-schedule_timeout-usage 2005-08-30 18:46:21.000000000 -0700
+++ devel-akpm/net/sunrpc/svcsock.c 2005-08-30 18:46:21.000000000 -0700
@@ -1167,8 +1167,7 @@ svc_recv(struct svc_serv *serv, struct s
while (rqstp->rq_arghi < pages) {
struct page *p = alloc_page(GFP_KERNEL);
if (!p) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(HZ/2);
+ schedule_timeout_uninterruptible(msecs_to_jiffies(500);
continue;
}
rqstp->rq_argpages[rqstp->rq_arghi++] = p;
_