From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 13 Aug 2009 18:59:38 +0000 (-0700)
Subject: .30 patch
X-Git-Tag: v2.6.30.5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=383724821e048cad461fbcce23e53a35a044c45a;p=thirdparty%2Fkernel%2Fstable-queue.git

.30 patch
---

diff --git a/queue-2.6.30/make-sock_sendpage-use-kernel_sendpage.patch b/queue-2.6.30/make-sock_sendpage-use-kernel_sendpage.patch
new file mode 100644
index 00000000000..961bb224609
--- /dev/null
+++ b/queue-2.6.30/make-sock_sendpage-use-kernel_sendpage.patch
@@ -0,0 +1,39 @@
+From e694958388c50148389b0e9b9e9e8945cf0f1b98 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Thu, 13 Aug 2009 08:28:36 -0700
+Subject: Make sock_sendpage() use kernel_sendpage()
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit e694958388c50148389b0e9b9e9e8945cf0f1b98 upstream.
+
+kernel_sendpage() does the proper default case handling for when the
+socket doesn't have a native sendpage implementation.
+
+Now, arguably this might be something that we could instead solve by
+just specifying that all protocols should do it themselves at the
+protocol level, but we really only care about the common protocols.
+Does anybody really care about sendpage on something like Appletalk? Not
+likely.
+
+Acked-by: David S. Miller <davem@davemloft.net>
+Acked-by: Julien TINNES <julien@cr0.org>
+Acked-by: Tavis Ormandy <taviso@sdf.lonestar.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/socket.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file
+ 	if (more)
+ 		flags |= MSG_MORE;
+ 
+-	return sock->ops->sendpage(sock, page, offset, size, flags);
++	return kernel_sendpage(sock, page, offset, size, flags);
+ }
+ 
+ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
diff --git a/queue-2.6.30/series b/queue-2.6.30/series
index d1ba2416941..68069426c42 100644
--- a/queue-2.6.30/series
+++ b/queue-2.6.30/series
@@ -67,3 +67,4 @@ x86-fix-vmi-stack-protector.patch
 mm_for_maps-simplify-use-ptrace_may_access.patch
 mm_for_maps-shift-down_read-to-the-caller.patch
 mm_for_maps-take-cred_guard_mutex-to-fix-the-race-with-exec.patch
+make-sock_sendpage-use-kernel_sendpage.patch