On Fri, 2017-06-30 at 14:23 +0100, Stefan Hajnoczi wrote:
> svc_bc_tcp_create() is a helper function that simply calls
> svc_bc_create_socket() with an added IPPROTO_TCP argument.
>
> svc_bc_create_socket() then checks that the protocol argument is indeed
> IPPROTO_TCP.
>
> This isn't necessary since svc_bc_tcp_create() is the only
> svc_bc_create_socket() caller. The next patch adds a second caller for
> AF_VSOCK where IPPROTO_TCP will not be used.
>
> Scrap this scheme and just call svc_bc_create_socket() directly.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
> ---
> net/sunrpc/svcsock.c | 21 +++------------------
> 1 file changed, 3 insertions(+), 18 deletions(-)
>
> diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
> index 2b720fa..394e7a2 100644
> --- a/net/sunrpc/svcsock.c
> +++ b/net/sunrpc/svcsock.c
> @@ -71,7 +71,7 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *, int,
> struct net *, struct sockaddr *,
> int, int);
> #if defined(CONFIG_SUNRPC_BACKCHANNEL)
> -static struct svc_xprt *svc_bc_create_socket(struct svc_serv *, int,
> +static struct svc_xprt *svc_bc_create_socket(struct svc_serv *,
> struct net *, struct sockaddr *,
> int, int);
> static void svc_bc_sock_free(struct svc_xprt *xprt);
> @@ -1212,25 +1212,17 @@ static struct svc_xprt *svc_tcp_create(struct svc_serv *serv,
> }
>
> #if defined(CONFIG_SUNRPC_BACKCHANNEL)
> -static struct svc_xprt *svc_bc_create_socket(struct svc_serv *, int,
> +static struct svc_xprt *svc_bc_create_socket(struct svc_serv *,
> struct net *, struct sockaddr *,
> int, int);
> static void svc_bc_sock_free(struct svc_xprt *xprt);
>
> -static struct svc_xprt *svc_bc_tcp_create(struct svc_serv *serv,
> - struct net *net,
> - struct sockaddr *sa, int salen,
> - int flags)
> -{
> - return svc_bc_create_socket(serv, IPPROTO_TCP, net, sa, salen, flags);
> -}
> -
> static void svc_bc_tcp_sock_detach(struct svc_xprt *xprt)
> {
> }
>
> static struct svc_xprt_ops svc_tcp_bc_ops = {
> - .xpo_create = svc_bc_tcp_create,
> + .xpo_create = svc_bc_create_socket,
> .xpo_detach = svc_bc_tcp_sock_detach,
> .xpo_free = svc_bc_sock_free,
> .xpo_prep_reply_hdr = svc_tcp_prep_reply_hdr,
> @@ -1615,7 +1607,6 @@ static void svc_sock_free(struct svc_xprt *xprt)
> * Create a back channel svc_xprt which shares the fore channel socket.
> */
> static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
> - int protocol,
> struct net *net,
> struct sockaddr *sin, int len,
> int flags)
> @@ -1623,12 +1614,6 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
> struct svc_sock *svsk;
> struct svc_xprt *xprt;
>
> - if (protocol != IPPROTO_TCP) {
> - printk(KERN_WARNING "svc: only TCP sockets"
> - " supported on shared back channel\n");
> - return ERR_PTR(-EINVAL);
> - }
> -
> svsk = kzalloc(sizeof(*svsk), GFP_KERNEL);
> if (!svsk)
> return ERR_PTR(-ENOMEM);
This one can go in ahead of the rest, I think. Trond or Bruce, do either
of you want to pick this up for the next merge window?
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
