1 files changed, 20 insertions, 18 deletions

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index 15656b8573f3..02efb25c2957 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -316,8 +316,7 @@ static void p9_read_work(struct work_struct *work)
                                                 m->rsize - m->rpos);
         p9_debug(P9_DEBUG_TRANS, "mux %p got %d bytes\n", m, err);
         if (err == -EAGAIN) {
-                clear_bit(Rworksched, &m->wsched);
-                return;
+                goto end_clear;
         }
 
         if (err <= 0)
@@ -379,19 +378,20 @@ static void p9_read_work(struct work_struct *work)
                 m->req = NULL;
         }
 
+end_clear:
+        clear_bit(Rworksched, &m->wsched);
+
         if (!list_empty(&m->req_list)) {
                 if (test_and_clear_bit(Rpending, &m->wsched))
                         n = POLLIN;
                 else
                         n = p9_fd_poll(m->client, NULL);
 
-                if (n & POLLIN) {
+                if ((n & POLLIN) && !test_and_set_bit(Rworksched, &m->wsched)) {
                         p9_debug(P9_DEBUG_TRANS, "sched read work %p\n", m);
                         schedule_work(&m->rq);
-                } else
-                        clear_bit(Rworksched, &m->wsched);
-        } else
-                clear_bit(Rworksched, &m->wsched);
+                }
+        }
 
         return;
 error:
@@ -453,12 +453,13 @@ static void p9_write_work(struct work_struct *work)
         }
 
         if (!m->wsize) {
+                spin_lock(&m->client->lock);
                 if (list_empty(&m->unsent_req_list)) {
                         clear_bit(Wworksched, &m->wsched);
+                        spin_unlock(&m->client->lock);
                         return;
                 }
 
-                spin_lock(&m->client->lock);
                 req = list_entry(m->unsent_req_list.next, struct p9_req_t,
                                req_list);
                 req->status = REQ_STATUS_SENT;
@@ -476,10 +477,9 @@ static void p9_write_work(struct work_struct *work)
         clear_bit(Wpending, &m->wsched);
         err = p9_fd_write(m->client, m->wbuf + m->wpos, m->wsize - m->wpos);
         p9_debug(P9_DEBUG_TRANS, "mux %p sent %d bytes\n", m, err);
-        if (err == -EAGAIN) {
-                clear_bit(Wworksched, &m->wsched);
-                return;
-        }
+        if (err == -EAGAIN)
+                goto end_clear;
+
 
         if (err < 0)
                 goto error;
@@ -492,19 +492,21 @@ static void p9_write_work(struct work_struct *work)
         if (m->wpos == m->wsize)
                 m->wpos = m->wsize = 0;
 
-        if (m->wsize == 0 && !list_empty(&m->unsent_req_list)) {
+end_clear:
+        clear_bit(Wworksched, &m->wsched);
+
+        if (m->wsize || !list_empty(&m->unsent_req_list)) {
                 if (test_and_clear_bit(Wpending, &m->wsched))
                         n = POLLOUT;
                 else
                         n = p9_fd_poll(m->client, NULL);
 
-                if (n & POLLOUT) {
+                if ((n & POLLOUT) &&
+                   !test_and_set_bit(Wworksched, &m->wsched)) {
                         p9_debug(P9_DEBUG_TRANS, "sched write work %p\n", m);
                         schedule_work(&m->wq);
-                } else
-                        clear_bit(Wworksched, &m->wsched);
-        } else
-                clear_bit(Wworksched, &m->wsched);
+                }
+        }
 
         return;