]>
Commit | Line | Data |
---|---|---|
efcf5dc5 AG |
1 | From: Linus Torvalds <torvalds@linux-foundation.org> |
2 | Date: Thu, 13 Aug 2009 15:28:36 +0000 (-0700) | |
3 | Subject: Make sock_sendpage() use kernel_sendpage() | |
4 | X-Git-Tag: v2.6.31-rc6~8 | |
5 | X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e694958388c50148389b0e9b9e9e8945cf0f1b98 | |
6 | ||
7 | Make sock_sendpage() use kernel_sendpage() | |
8 | ||
9 | kernel_sendpage() does the proper default case handling for when the | |
10 | socket doesn't have a native sendpage implementation. | |
11 | ||
12 | Now, arguably this might be something that we could instead solve by | |
13 | just specifying that all protocols should do it themselves at the | |
14 | protocol level, but we really only care about the common protocols. | |
15 | Does anybody really care about sendpage on something like Appletalk? Not | |
16 | likely. | |
17 | ||
18 | Acked-by: David S. Miller <davem@davemloft.net> | |
19 | Acked-by: Julien TINNES <julien@cr0.org> | |
20 | Acked-by: Tavis Ormandy <taviso@sdf.lonestar.org> | |
21 | Cc: stable@kernel.org | |
22 | Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> | |
23 | --- | |
24 | ||
25 | diff --git a/net/socket.c b/net/socket.c | |
26 | index 791d71a..6d47165 100644 | |
27 | --- a/net/socket.c | |
28 | +++ b/net/socket.c | |
29 | @@ -736,7 +736,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, | |
30 | if (more) | |
31 | flags |= MSG_MORE; | |
32 | ||
33 | - return sock->ops->sendpage(sock, page, offset, size, flags); | |
34 | + return kernel_sendpage(sock, page, offset, size, flags); | |
35 | } | |
36 | ||
37 | static ssize_t sock_splice_read(struct file *file, loff_t *ppos, |