aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-07-25 08:57:06 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-07-27 16:49:21 -0400
commit9695c7057f4887ed54dc1e6c2ef22f72a2be1175 (patch)
treea9ca62e819e904d9b53629f1b7c45126416a2395 /fs/nfs
parent5e1533c7880bb0df98f71fa683979ec296aa947d (diff)
SUNRPC: service request network namespace helper introduced
This is a cleanup patch - makes code looks simplier. It replaces widely used rqstp->rq_xprt->xpt_net by introduced SVC_NET(rqstp). Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/callback_xdr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index e64b01d2a338..742ff4ffced7 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -863,7 +863,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
863 .drc_status = 0, 863 .drc_status = 0,
864 .clp = NULL, 864 .clp = NULL,
865 .slotid = NFS4_NO_SLOT, 865 .slotid = NFS4_NO_SLOT,
866 .net = rqstp->rq_xprt->xpt_net, 866 .net = SVC_NET(rqstp),
867 }; 867 };
868 unsigned int nops = 0; 868 unsigned int nops = 0;
869 869
@@ -879,7 +879,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r
879 return rpc_garbage_args; 879 return rpc_garbage_args;
880 880
881 if (hdr_arg.minorversion == 0) { 881 if (hdr_arg.minorversion == 0) {
882 cps.clp = nfs4_find_client_ident(rqstp->rq_xprt->xpt_net, hdr_arg.cb_ident); 882 cps.clp = nfs4_find_client_ident(SVC_NET(rqstp), hdr_arg.cb_ident);
883 if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp)) 883 if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp))
884 return rpc_drop_reply; 884 return rpc_drop_reply;
885 } 885 }