Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9695c705 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

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: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 5e1533c7

fs/lockd/host.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp, 
	struct nsm_handle *nsm = NULL;

	struct sockaddr *src_sap = svc_daddr(rqstp);

	size_t src_len = rqstp->rq_daddrlen;

	struct net *net = rqstp->rq_xprt->xpt_net;

	struct net *net = SVC_NET(rqstp);

	struct nlm_lookup_host_info ni = {

		.server		= 1,

		.sap		= svc_addr(rqstp),

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
		.drc_status = 0,

		.clp = NULL,

		.slotid = NFS4_NO_SLOT,

		.net = rqstp->rq_xprt->xpt_net,

		.net = SVC_NET(rqstp),

	};

	unsigned int nops = 0;
@@ -879,7 +879,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r 
		return rpc_garbage_args;



	if (hdr_arg.minorversion == 0) {

		cps.clp = nfs4_find_client_ident(rqstp->rq_xprt->xpt_net, hdr_arg.cb_ident);

		cps.clp = nfs4_find_client_ident(SVC_NET(rqstp), hdr_arg.cb_ident);

		if (!cps.clp || !check_gss_callback_principal(cps.clp, rqstp))

			return rpc_drop_reply;

	}

fs/nfsd/export.c

+2 −2
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ struct svc_export * 
rqst_exp_get_by_name(struct svc_rqst *rqstp, struct path *path)

{

	struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);

	struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

	struct cache_detail *cd = nn->svc_export_cache;



	if (rqstp->rq_client == NULL)
@@ -960,7 +960,7 @@ struct svc_export * 
rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)

{

	struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);

	struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

	struct cache_detail *cd = nn->svc_export_cache;



	if (rqstp->rq_client == NULL)

fs/nfsd/nfs4idmap.c

+2 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen 
		.type = type,

	};

	int ret;

	struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);



	if (namelen + 1 > sizeof(key.name))

		return nfserr_badowner;
@@ -571,7 +571,7 @@ idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name) 
		.type = type,

	};

	int ret;

	struct nfsd_net *nn = net_generic(rqstp->rq_xprt->xpt_net, nfsd_net_id);

	struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);



	strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));

	ret = idmap_lookup(rqstp, idtoname_lookup, &key, nn->idtoname_cache, &item);

include/linux/sunrpc/svc.h

+2 −0
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ struct svc_rqst { 
	struct task_struct	*rq_task;	/* service thread */

};



#define SVC_NET(svc_rqst)	(svc_rqst->rq_xprt->xpt_net)



/*

 * Rigorous type checking on sockaddr type conversions

 */