From 52b8eb7f27082a933df30a032bd0fc5522cd3be2 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 6 Oct 2003 17:48:10 -0700 Subject: [PATCH] [NET]: schedule_timeout() sets curr_state, from Alexey Dobriyan . --- net/atm/resources.c | 1 - net/bluetooth/hci_core.c | 1 - net/ipv4/ipvs/ip_vs_sync.c | 2 -- net/sunrpc/svcsock.c | 1 - 4 files changed, 5 deletions(-) diff --git a/net/atm/resources.c b/net/atm/resources.c index bbae94bd7f207..a72dc2d428461 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c @@ -139,7 +139,6 @@ void atm_dev_deregister(struct atm_dev *dev) while (atomic_read(&dev->refcnt) != 1) { current->state = TASK_INTERRUPTIBLE; schedule_timeout(HZ / 4); - current->state = TASK_RUNNING; if ((jiffies - warning_time) > 10 * HZ) { printk(KERN_EMERG "atm_dev_deregister: waiting for " "dev %d to become free. Usage count = %d\n", diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 272536a80ba26..2436a71ed5633 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -161,7 +161,6 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, req(hdev, opt); schedule_timeout(timeout); - set_current_state(TASK_RUNNING); remove_wait_queue(&hdev->req_wait_q, &wait); if (signal_pending(current)) diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index fcb7ec350a90e..c9b815bef3027 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c @@ -669,7 +669,6 @@ static void sync_master_loop(void) __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ); - __set_current_state(TASK_RUNNING); } /* clean up the sync_buff queue */ @@ -728,7 +727,6 @@ static void sync_backup_loop(void) __set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ); - __set_current_state(TASK_RUNNING); } /* release the sending multicast socket */ diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 3a1346a71bf88..12f412e61c3b6 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1151,7 +1151,6 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) if (!p) { set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ/2); - current->state = TASK_RUNNING; continue; } rqstp->rq_argpages[rqstp->rq_arghi++] = p; -- 2.53.0