From: Christoph Hellwig <hch@lst.de>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Vlad Yasevich <vyasevich@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Cc: David Laight <David.Laight@ACULAB.COM>,
linux-sctp@vger.kernel.org, linux-kernel@vger.kernel.org,
cluster-devel@redhat.com, netdev@vger.kernel.org
Subject: [PATCH 4/4] net: remove kernel_setsockopt
Date: Fri, 29 May 2020 12:09:43 +0000 [thread overview]
Message-ID: <20200529120943.101454-5-hch@lst.de> (raw)
In-Reply-To: <20200529120943.101454-1-hch@lst.de>
No users left.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/net.h | 2 --
net/socket.c | 31 -------------------------------
2 files changed, 33 deletions(-)
diff --git a/include/linux/net.h b/include/linux/net.h
index 74ef5d7315f70..e10f378194a59 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -303,8 +303,6 @@ int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
int flags);
int kernel_getsockname(struct socket *sock, struct sockaddr *addr);
int kernel_getpeername(struct socket *sock, struct sockaddr *addr);
-int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval,
- unsigned int optlen);
int kernel_sendpage(struct socket *sock, struct page *page, int offset,
size_t size, int flags);
int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,
diff --git a/net/socket.c b/net/socket.c
index 81a98b6cbd087..976426d03f099 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -3624,37 +3624,6 @@ int kernel_getpeername(struct socket *sock, struct sockaddr *addr)
}
EXPORT_SYMBOL(kernel_getpeername);
-/**
- * kernel_setsockopt - set a socket option (kernel space)
- * @sock: socket
- * @level: API level (SOL_SOCKET, ...)
- * @optname: option tag
- * @optval: option value
- * @optlen: option length
- *
- * Returns 0 or an error.
- */
-
-int kernel_setsockopt(struct socket *sock, int level, int optname,
- char *optval, unsigned int optlen)
-{
- mm_segment_t oldfs = get_fs();
- char __user *uoptval;
- int err;
-
- uoptval = (char __user __force *) optval;
-
- set_fs(KERNEL_DS);
- if (level = SOL_SOCKET)
- err = sock_setsockopt(sock, level, optname, uoptval, optlen);
- else
- err = sock->ops->setsockopt(sock, level, optname, uoptval,
- optlen);
- set_fs(oldfs);
- return err;
-}
-EXPORT_SYMBOL(kernel_setsockopt);
-
/**
* kernel_sendpage - send a &page through a socket (kernel space)
* @sock: socket
--
2.26.2
next prev parent reply other threads:[~2020-05-29 12:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 12:09 remove kernel_setsockopt v4 Christoph Hellwig
2020-05-29 12:09 ` [PATCH 1/4] sctp: add sctp_sock_set_nodelay Christoph Hellwig
2020-05-29 16:05 ` Marcelo Ricardo Leitner
2020-05-29 18:09 ` David Teigland
2020-05-29 12:09 ` [PATCH 2/4] sctp: refactor sctp_setsockopt_bindx Christoph Hellwig
2020-05-29 16:05 ` Marcelo Ricardo Leitner
2020-06-01 8:27 ` David Laight
2020-05-29 12:09 ` [PATCH 3/4] net: add a new bind_add method Christoph Hellwig
2020-05-29 16:06 ` Marcelo Ricardo Leitner
2020-05-29 12:09 ` Christoph Hellwig [this message]
2020-05-29 12:27 ` [PATCH 4/4] net: remove kernel_setsockopt David Laight
2020-05-29 12:29 ` 'Christoph Hellwig'
2020-05-29 16:10 ` Marcelo Ricardo Leitner
2020-05-29 20:11 ` remove kernel_setsockopt v4 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529120943.101454-5-hch@lst.de \
--to=hch@lst.de \
--cc=David.Laight@ACULAB.COM \
--cc=cluster-devel@redhat.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=vyasevich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).