| From b8be5674fa9a6f3677865ea93f7803c4212f3e10 Mon Sep 17 00:00:00 2001 |
| From: Vasily Averin <vvs@virtuozzo.com> |
| Date: Mon, 24 Dec 2018 14:44:42 +0300 |
| Subject: sunrpc: use SVC_NET() in svcauth_gss_* functions |
| |
| From: Vasily Averin <vvs@virtuozzo.com> |
| |
| commit b8be5674fa9a6f3677865ea93f7803c4212f3e10 upstream. |
| |
| Signed-off-by: Vasily Averin <vvs@virtuozzo.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: J. Bruce Fields <bfields@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/sunrpc/auth_gss/svcauth_gss.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/net/sunrpc/auth_gss/svcauth_gss.c |
| +++ b/net/sunrpc/auth_gss/svcauth_gss.c |
| @@ -1122,7 +1122,7 @@ static int svcauth_gss_legacy_init(struc |
| struct kvec *resv = &rqstp->rq_res.head[0]; |
| struct rsi *rsip, rsikey; |
| int ret; |
| - struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); |
| + struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); |
| |
| memset(&rsikey, 0, sizeof(rsikey)); |
| ret = gss_read_verf(gc, argv, authp, |
| @@ -1233,7 +1233,7 @@ static int svcauth_gss_proxy_init(struct |
| uint64_t handle; |
| int status; |
| int ret; |
| - struct net *net = rqstp->rq_xprt->xpt_net; |
| + struct net *net = SVC_NET(rqstp); |
| struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); |
| |
| memset(&ud, 0, sizeof(ud)); |
| @@ -1424,7 +1424,7 @@ svcauth_gss_accept(struct svc_rqst *rqst |
| __be32 *rpcstart; |
| __be32 *reject_stat = resv->iov_base + resv->iov_len; |
| int ret; |
| - struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); |
| + struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); |
| |
| dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n", |
| argv->iov_len); |
| @@ -1714,7 +1714,7 @@ svcauth_gss_release(struct svc_rqst *rqs |
| struct rpc_gss_wire_cred *gc = &gsd->clcred; |
| struct xdr_buf *resbuf = &rqstp->rq_res; |
| int stat = -EINVAL; |
| - struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id); |
| + struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id); |
| |
| if (gc->gc_proc != RPC_GSS_PROC_DATA) |
| goto out; |