From 3c1e921a93247ed5928bf72abb1146837554db50 Mon Sep 17 00:00:00 2001
From: Simon Derr <simon.derr@bull.net>
Date: Mon, 17 Sep 2012 15:16:30 +0200
Subject: [PATCH] --- yaml --- r: 333413 b: refs/heads/master c:
 584a8c13d58423462680907d4cc40d9929c9030a h: refs/heads/master i:   333411:
 6f4547c9150e22478b0ba48ade9dc0b8815b4807 v: v3

---
 [refs]                  |  2 +-
 trunk/net/9p/trans_fd.c | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5a4c64642e8b..6829af0125ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1957b3a86f8eb5ceab32e3aae99e2822258aa530
+refs/heads/master: 584a8c13d58423462680907d4cc40d9929c9030a
diff --git a/trunk/net/9p/trans_fd.c b/trunk/net/9p/trans_fd.c
index 7088a94b2601..b2c308fffb8a 100644
--- a/trunk/net/9p/trans_fd.c
+++ b/trunk/net/9p/trans_fd.c
@@ -476,10 +476,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 +491,21 @@ static void p9_write_work(struct work_struct *work)
 	if (m->wpos == m->wsize)
 		m->wpos = m->wsize = 0;
 
+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;