From f6de96989e57711dd99691b96bb5992b88276d97 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Mon, 24 Aug 2009 13:18:04 -0500
Subject: [PATCH] --- yaml --- r: 163111 b: refs/heads/master c:
 1329e3f2c898cfabb6ed236d3fb8c1725197af53 h: refs/heads/master i:   163109:
 a3c7cd93795eec08386461ef4c95c8bf047e139e   163107:
 511bb2e76712a7e6629828e0aa7fcd7388e2e5a3   163103:
 da31e8d6c6567add2e4e9a5d6e5c6eb1b2dc78a5 v: v3

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

diff --git a/[refs] b/[refs]
index 8b5e8864f6bd..f54c20bfda1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 063c4c99630c0b06afad080d2a18bda64172c1a2
+refs/heads/master: 1329e3f2c898cfabb6ed236d3fb8c1725197af53
diff --git a/trunk/fs/dlm/lowcomms.c b/trunk/fs/dlm/lowcomms.c
index bda690cd3640..240cef14fe58 100644
--- a/trunk/fs/dlm/lowcomms.c
+++ b/trunk/fs/dlm/lowcomms.c
@@ -1285,7 +1285,6 @@ void dlm_lowcomms_commit_buffer(void *mh)
 static void send_to_sock(struct connection *con)
 {
 	int ret = 0;
-	ssize_t(*sendpage) (struct socket *, struct page *, int, size_t, int);
 	const int msg_flags = MSG_DONTWAIT | MSG_NOSIGNAL;
 	struct writequeue_entry *e;
 	int len, offset;
@@ -1294,8 +1293,6 @@ static void send_to_sock(struct connection *con)
 	if (con->sock == NULL)
 		goto out_connect;
 
-	sendpage = con->sock->ops->sendpage;
-
 	spin_lock(&con->writequeue_lock);
 	for (;;) {
 		e = list_entry(con->writequeue.next, struct writequeue_entry,
@@ -1310,8 +1307,8 @@ static void send_to_sock(struct connection *con)
 
 		ret = 0;
 		if (len) {
-			ret = sendpage(con->sock, e->page, offset, len,
-				       msg_flags);
+			ret = kernel_sendpage(con->sock, e->page, offset, len,
+					      msg_flags);
 			if (ret == -EAGAIN || ret == 0) {
 				cond_resched();
 				goto out;