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

Commit c7afef1f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] nfsd: misc endianness annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f00f328f

fs/nfsd/export.c

+2 −2
Original line number Diff line number Diff line
@@ -1148,12 +1148,12 @@ exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, 
 * for a given NFSv4 client.   The root is defined to be the

 * export point with fsid==0

 */

int

__be32

exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,

	       struct cache_req *creq)

{

	struct svc_export *exp;

	int rv;

	__be32 rv;

	u32 fsidv[2];



	mk_fsid_v1(fsidv, 0);

fs/nfsd/lockd.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static u32

nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp)

{

	u32		nfserr;

	__be32		nfserr;

	struct svc_fh	fh;



	/* must initialize before using! but maxsize doesn't matter */

fs/nfsd/nfs4callback.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ nfs4_cb_null(struct rpc_task *task, void *dummy) 
{

	struct nfs4_client *clp = (struct nfs4_client *)task->tk_msg.rpc_argp;

	struct nfs4_callback *cb = &clp->cl_callback;

	u32 addr = htonl(cb->cb_addr);

	__be32 addr = htonl(cb->cb_addr);



	dprintk("NFSD: nfs4_cb_null task->tk_status %d\n", task->tk_status);

fs/nfsd/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se) 
__be32

nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid)

{

	u32 			ip_addr = rqstp->rq_addr.sin_addr.s_addr;

	__be32 			ip_addr = rqstp->rq_addr.sin_addr.s_addr;

	struct xdr_netobj 	clname = { 

		.len = setclid->se_namelen,

		.data = setclid->se_name,
@@ -878,7 +878,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_setclientid *setclid) 
__be32

nfsd4_setclientid_confirm(struct svc_rqst *rqstp, struct nfsd4_setclientid_confirm *setclientid_confirm)

{

	u32 ip_addr = rqstp->rq_addr.sin_addr.s_addr;

	__be32 ip_addr = rqstp->rq_addr.sin_addr.s_addr;

	struct nfs4_client *conf, *unconf;

	nfs4_verifier confirm = setclientid_confirm->sc_confirm; 

	clientid_t * clid = &setclientid_confirm->sc_clientid;

fs/nfsd/nfscache.c

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 */

#define CACHESIZE		1024

#define HASHSIZE		64

#define REQHASH(xid)		((((xid) >> 24) ^ (xid)) & (HASHSIZE-1))

#define REQHASH(xid)		(((((__force __u32)xid) >> 24) ^ ((__force __u32)xid)) & (HASHSIZE-1))



static struct hlist_head *	hash_list;

static struct list_head 	lru_head;
@@ -127,8 +127,8 @@ nfsd_cache_lookup(struct svc_rqst *rqstp, int type) 
	struct hlist_node	*hn;

	struct hlist_head 	*rh;

	struct svc_cacherep	*rp;

	u32			xid = rqstp->rq_xid,

				proto =  rqstp->rq_prot,

	__be32			xid = rqstp->rq_xid;

	u32			proto =  rqstp->rq_prot,

				vers = rqstp->rq_vers,

				proc = rqstp->rq_proc;

	unsigned long		age;
@@ -258,7 +258,7 @@ nfsd_cache_lookup(struct svc_rqst *rqstp, int type) 
 * In this case, nfsd_cache_update is called with statp == NULL.

 */

void

nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, u32 *statp)

nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)

{

	struct svc_cacherep *rp;

	struct kvec	*resv = &rqstp->rq_res.head[0], *cachv;