From 7e47ab4e389cf5216829c5e0cff66348a73094ce Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Fri, 14 Sep 2007 08:49:21 +0100
Subject: [PATCH] --- yaml --- r: 67686 b: refs/heads/master c:
 d66f8277f53407754f50ae6bada68f1b68d04d48 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/dlm/lowcomms.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 63e8bff9448e..1ed92be237fd 100644
--- 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
index 62a8a6ccd992..58bf3f5cdbe2 100644
--- 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;