sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)

[linux-2.6-microblaze.git] / net / kcm / kcmsock.c

diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index d0537c1..393f01b 100644 (file)
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -963,24 +963,6 @@ static void kcm_splice_eof(struct socket *sock)
        release_sock(sk);
 }
 
-static ssize_t kcm_sendpage(struct socket *sock, struct page *page,
-                           int offset, size_t size, int flags)
-
-{
-       struct bio_vec bvec;
-       struct msghdr msg = { .msg_flags = flags | MSG_SPLICE_PAGES, };
-
-       if (flags & MSG_SENDPAGE_NOTLAST)
-               msg.msg_flags |= MSG_MORE;
-
-       if (flags & MSG_OOB)
-               return -EOPNOTSUPP;
-
-       bvec_set_page(&bvec, page, size, offset);
-       iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, size);
-       return kcm_sendmsg(sock, &msg, size);
-}
-
 static int kcm_recvmsg(struct socket *sock, struct msghdr *msg,
                       size_t len, int flags)
 {
@@ -1769,7 +1751,6 @@ static const struct proto_ops kcm_dgram_ops = {
        .recvmsg =      kcm_recvmsg,
        .mmap =         sock_no_mmap,
        .splice_eof =   kcm_splice_eof,
-       .sendpage =     kcm_sendpage,
 };
 
 static const struct proto_ops kcm_seqpacket_ops = {
@@ -1791,7 +1772,6 @@ static const struct proto_ops kcm_seqpacket_ops = {
        .recvmsg =      kcm_recvmsg,
        .mmap =         sock_no_mmap,
        .splice_eof =   kcm_splice_eof,
-       .sendpage =     kcm_sendpage,
        .splice_read =  kcm_splice_read,
 };