---

yaml --- r: 67686 b: refs/heads/master c: d66f827 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 7e47ab4 · 7e47ab4
1 parent 4ab7ada
commit 7e47ab4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e61f2ef6f7d1d0296e3e30d366b28e0ca595c2
+refs/heads/master: d66f8277f53407754f50ae6bada68f1b68d04d48
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
@@ -1264,14 +1264,15 @@ static void send_to_sock(struct connection *con)
 		if (len) {
 			ret = sendpage(con->sock, e->page, offset, len,
 				       msg_flags);
-			if (ret == -EAGAIN || ret == 0)
+			if (ret == -EAGAIN || ret == 0) {
+				cond_resched();
 				goto out;
+			}
 			if (ret <= 0)
 				goto send_error;
-		} else {
+		}
 			/* Don't starve people filling buffers */
 			cond_resched();
-		}
 
 		spin_lock(&con->writequeue_lock);
 		e->offset += ret;