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

Commit 1be27f36 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Remove the tk_auth macro... 



We should almost always be deferencing the rpc_auth struct by means of the
credential's cr_auth field instead of the rpc_clnt->cl_auth anyway. Fix up
that historical mistake, and remove the macro that propagated it.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1dd17ec6

fs/nfs/nfs2xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ nfs_xdr_diropargs(struct rpc_rqst *req, __be32 *p, struct nfs_diropargs *args) 
static int

nfs_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args)

{

	struct rpc_auth	*auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;

	u32 offset = (u32)args->offset;

	u32 count = args->count;
@@ -380,7 +380,7 @@ static int 
nfs_xdr_readdirargs(struct rpc_rqst *req, __be32 *p, struct nfs_readdirargs *args)

{

	struct rpc_task	*task = req->rq_task;

	struct rpc_auth	*auth = task->tk_auth;

	struct rpc_auth	*auth = task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;

	u32 count = args->count;
@@ -541,7 +541,7 @@ nfs_xdr_diropres(struct rpc_rqst *req, __be32 *p, struct nfs_diropok *res) 
static int

nfs_xdr_readlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs_readlinkargs *args)

{

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;



	p = xdr_encode_fhandle(p, args->fh);

fs/nfs/nfs3xdr.c

+4 −4
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ nfs3_xdr_accessargs(struct rpc_rqst *req, __be32 *p, struct nfs3_accessargs *arg 
static int

nfs3_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args)

{

	struct rpc_auth	*auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;

	u32 count = args->count;
@@ -458,7 +458,7 @@ nfs3_xdr_linkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_linkargs *args) 
static int

nfs3_xdr_readdirargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirargs *args)

{

	struct rpc_auth	*auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;

	u32 count = args->count;
@@ -643,7 +643,7 @@ static int 
nfs3_xdr_getaclargs(struct rpc_rqst *req, __be32 *p,

		    struct nfs3_getaclargs *args)

{

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;



	p = xdr_encode_fhandle(p, args->fh);
@@ -773,7 +773,7 @@ nfs3_xdr_accessres(struct rpc_rqst *req, __be32 *p, struct nfs3_accessres *res) 
static int

nfs3_xdr_readlinkargs(struct rpc_rqst *req, __be32 *p, struct nfs3_readlinkargs *args)

{

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth	*auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;



	p = xdr_encode_fhandle(p, args->fh);

fs/nfs/nfs4xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static int encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args) 


static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req)

{

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	uint32_t attrs[2] = {

		FATTR4_WORD0_RDATTR_ERROR|FATTR4_WORD0_FILEID,

		FATTR4_WORD1_MOUNTED_ON_FILEID,
@@ -1117,7 +1117,7 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg 


static int encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *readlink, struct rpc_rqst *req)

{

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	unsigned int replen;

	__be32 *p;
@@ -1735,7 +1735,7 @@ static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nf 
 */

static int nfs4_xdr_enc_read(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args)

{

	struct rpc_auth	*auth = req->rq_task->tk_auth;

	struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	struct xdr_stream xdr;

	struct compound_hdr hdr = {

		.nops = 2,
@@ -1795,7 +1795,7 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p, 
		struct nfs_getaclargs *args)

{

	struct xdr_stream xdr;

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	struct compound_hdr hdr = {

		.nops   = 2,

	};
@@ -2030,7 +2030,7 @@ static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs 
	struct compound_hdr hdr = {

		.nops = 3,

	};

	struct rpc_auth *auth = req->rq_task->tk_auth;

	struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;

	int replen;

	int status;

include/linux/sunrpc/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ struct rpc_task { 
	unsigned short		tk_pid;		/* debugging aid */

#endif

};

#define tk_auth			tk_client->cl_auth

#define tk_xprt			tk_client->cl_xprt



/* support walking a list of tasks on a wait queue */

net/sunrpc/auth.c

+13 −12
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ EXPORT_SYMBOL(rpcauth_init_cred); 
struct rpc_cred *

rpcauth_bindcred(struct rpc_task *task)

{

	struct rpc_auth *auth = task->tk_auth;

	struct rpc_auth *auth = task->tk_client->cl_auth;

	struct auth_cred acred = {

		.uid = current->fsuid,

		.gid = current->fsgid,
@@ -381,7 +381,7 @@ rpcauth_bindcred(struct rpc_task *task) 
	int flags = 0;



	dprintk("RPC: %5u looking up %s cred\n",

		task->tk_pid, task->tk_auth->au_ops->au_name);

		task->tk_pid, task->tk_client->cl_auth->au_ops->au_name);

	get_group_info(acred.group_info);

	if (task->tk_flags & RPC_TASK_ROOTCREDS)

		flags |= RPCAUTH_LOOKUP_ROOTCREDS;
@@ -397,11 +397,12 @@ rpcauth_bindcred(struct rpc_task *task) 
void

rpcauth_holdcred(struct rpc_task *task)

{

	dprintk("RPC: %5u holding %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name,

		task->tk_msg.rpc_cred);

	if (task->tk_msg.rpc_cred)

		get_rpccred(task->tk_msg.rpc_cred);

	struct rpc_cred *cred = task->tk_msg.rpc_cred;

	if (cred != NULL) {

		get_rpccred(cred);

		dprintk("RPC: %5u holding %s cred %p\n", task->tk_pid,

				cred->cr_auth->au_ops->au_name, cred);

	}

}



void
@@ -441,7 +442,7 @@ rpcauth_unbindcred(struct rpc_task *task) 
	struct rpc_cred	*cred = task->tk_msg.rpc_cred;



	dprintk("RPC: %5u releasing %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name, cred);

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	put_rpccred(cred);

	task->tk_msg.rpc_cred = NULL;
@@ -453,7 +454,7 @@ rpcauth_marshcred(struct rpc_task *task, __be32 *p) 
	struct rpc_cred	*cred = task->tk_msg.rpc_cred;



	dprintk("RPC: %5u marshaling %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name, cred);

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	return cred->cr_ops->crmarshal(task, p);

}
@@ -464,7 +465,7 @@ rpcauth_checkverf(struct rpc_task *task, __be32 *p) 
	struct rpc_cred	*cred = task->tk_msg.rpc_cred;



	dprintk("RPC: %5u validating %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name, cred);

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	return cred->cr_ops->crvalidate(task, p);

}
@@ -505,7 +506,7 @@ rpcauth_refreshcred(struct rpc_task *task) 
	int err;



	dprintk("RPC: %5u refreshing %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name, cred);

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);



	err = cred->cr_ops->crrefresh(task);

	if (err < 0)
@@ -519,7 +520,7 @@ rpcauth_invalcred(struct rpc_task *task) 
	struct rpc_cred *cred = task->tk_msg.rpc_cred;



	dprintk("RPC: %5u invalidating %s cred %p\n",

		task->tk_pid, task->tk_auth->au_ops->au_name, cred);

		task->tk_pid, cred->cr_auth->au_ops->au_name, cred);

	if (cred)

		clear_bit(RPCAUTH_CRED_UPTODATE, &cred->cr_flags);

}