diff options
| -rw-r--r-- | fs/dlm/lowcomms.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 871d4e9f49fb..b05c6d9b5102 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -1418,7 +1418,10 @@ static void send_to_sock(struct connection *con) const int msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL; struct writequeue_entry *e; int len, offset, ret; - int count = 0; + int count; + +again: + count = 0; mutex_lock(&con->sock_mutex); if (con->sock == NULL) @@ -1453,14 +1456,16 @@ static void send_to_sock(struct connection *con) } else if (ret < 0) goto out; + spin_lock(&con->writequeue_lock); + writequeue_entry_complete(e, ret); + /* Don't starve people filling buffers */ if (++count >= MAX_SEND_MSG_COUNT) { + spin_unlock(&con->writequeue_lock); + mutex_unlock(&con->sock_mutex); cond_resched(); - count = 0; + goto again; } - - spin_lock(&con->writequeue_lock); - writequeue_entry_complete(e, ret); } spin_unlock(&con->writequeue_lock); |