diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/9p | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_fd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 8d934dd7fd54..4dd873e3a1bb 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c | |||
| @@ -633,8 +633,8 @@ static void p9_poll_mux(struct p9_conn *m) | |||
| 633 | if (n & POLLOUT) { | 633 | if (n & POLLOUT) { |
| 634 | set_bit(Wpending, &m->wsched); | 634 | set_bit(Wpending, &m->wsched); |
| 635 | P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can write\n", m); | 635 | P9_DPRINTK(P9_DEBUG_TRANS, "mux %p can write\n", m); |
| 636 | if ((m->wsize || !list_empty(&m->unsent_req_list)) | 636 | if ((m->wsize || !list_empty(&m->unsent_req_list)) && |
| 637 | && !test_and_set_bit(Wworksched, &m->wsched)) { | 637 | !test_and_set_bit(Wworksched, &m->wsched)) { |
| 638 | P9_DPRINTK(P9_DEBUG_TRANS, "sched write work %p\n", m); | 638 | P9_DPRINTK(P9_DEBUG_TRANS, "sched write work %p\n", m); |
| 639 | queue_work(p9_mux_wq, &m->wq); | 639 | queue_work(p9_mux_wq, &m->wq); |
| 640 | } | 640 | } |