VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Patrick Caulfield <pcaulfie@redhat.com> 2007-09-14 08:49:21 +0100 committer: Steven Whitehouse <swhiteho@redhat.com> 2007-10-10 08:56:19 +0100 commit: d66f8277f53407754f50ae6bada68f1b68d04d48 parent: 49e61f2ef6f7d1d0296e3e30d366b28e0ca595c2
Commit Summary:
[DLM] Make dlm_sendd cond_resched more
Diffstat:
1 file changed, 4 insertions, 3 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 62a8a6ccd992..58bf3f5cdbe2 100644
--- a/fs/dlm/lowcomms.c
+++ b/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;