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

diff --git a/net/atm/resources.c b/net/atm/resources.c
index bbae94bd7f207311b050c02555b105c087b4233d..a72dc2d4284610b370b0a368daaf07883dd5e4fd 100644 (file)
--- 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 272536a80ba26aa5e616f5487e3cff367c805856..2436a71ed56334d5c793122dfe53fae8143bc6a8 100644 (file)
--- 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 fcb7ec350a90eddc1b47540ed672c4a205cb9fc2..c9b815bef3027a50445c40fa4190cfde24034eec 100644 (file)
--- 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 3a1346a71bf8834762e423ce5d33c5ab29705a40..12f412e61c3b683417831bf0820cdaae3fcc165f 100644 (file)
--- 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;