Commit 52b8eb7f authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller

[NET]: schedule_timeout() sets curr_state, from Alexey Dobriyan <adobriyan@mail.ru>.

parent 998b620f
No related merge requests found
...@@ -139,7 +139,6 @@ void atm_dev_deregister(struct atm_dev *dev) ...@@ -139,7 +139,6 @@ void atm_dev_deregister(struct atm_dev *dev)
while (atomic_read(&dev->refcnt) != 1) { while (atomic_read(&dev->refcnt) != 1) {
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ / 4); schedule_timeout(HZ / 4);
current->state = TASK_RUNNING;
if ((jiffies - warning_time) > 10 * HZ) { if ((jiffies - warning_time) > 10 * HZ) {
printk(KERN_EMERG "atm_dev_deregister: waiting for " printk(KERN_EMERG "atm_dev_deregister: waiting for "
"dev %d to become free. Usage count = %d\n", "dev %d to become free. Usage count = %d\n",
......
...@@ -161,7 +161,6 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, ...@@ -161,7 +161,6 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
req(hdev, opt); req(hdev, opt);
schedule_timeout(timeout); schedule_timeout(timeout);
set_current_state(TASK_RUNNING);
remove_wait_queue(&hdev->req_wait_q, &wait); remove_wait_queue(&hdev->req_wait_q, &wait);
if (signal_pending(current)) if (signal_pending(current))
......
...@@ -669,7 +669,6 @@ static void sync_master_loop(void) ...@@ -669,7 +669,6 @@ static void sync_master_loop(void)
__set_current_state(TASK_INTERRUPTIBLE); __set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ); schedule_timeout(HZ);
__set_current_state(TASK_RUNNING);
} }
/* clean up the sync_buff queue */ /* clean up the sync_buff queue */
...@@ -728,7 +727,6 @@ static void sync_backup_loop(void) ...@@ -728,7 +727,6 @@ static void sync_backup_loop(void)
__set_current_state(TASK_INTERRUPTIBLE); __set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout(HZ); schedule_timeout(HZ);
__set_current_state(TASK_RUNNING);
} }
/* release the sending multicast socket */ /* release the sending multicast socket */
......
...@@ -1151,7 +1151,6 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) ...@@ -1151,7 +1151,6 @@ svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout)
if (!p) { if (!p) {
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(HZ/2); schedule_timeout(HZ/2);
current->state = TASK_RUNNING;
continue; continue;
} }
rqstp->rq_argpages[rqstp->rq_arghi++] = p; rqstp->rq_argpages[rqstp->rq_arghi++] = p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment