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

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

[PATCH] lockd endianness annotations 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
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 7111c66e

fs/lockd/clntlock.c

+2 −2
Original line number Diff line number Diff line
@@ -100,12 +100,12 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) 
/*

 * The server lockd has called us back to tell us the lock was granted

 */

u32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock)

__be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock)

{

	const struct file_lock *fl = &lock->fl;

	const struct nfs_fh *fh = &lock->fh;

	struct nlm_wait	*block;

	u32 res = nlm_lck_denied;

	__be32 res = nlm_lck_denied;



	/*

	 * Look up blocked request based on arguments.

fs/lockd/mon.c

+6 −6
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ nsm_create(void) 
 * XDR functions for NSM.

 */



static u32 *

xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)

static __be32 *

xdr_encode_common(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp)

{

	char	buffer[20], *name;
@@ -176,7 +176,7 @@ xdr_encode_common(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) 
}



static int

xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)

xdr_encode_mon(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp)

{

	p = xdr_encode_common(rqstp, p, argp);

	if (IS_ERR(p))
@@ -192,7 +192,7 @@ xdr_encode_mon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) 
}



static int

xdr_encode_unmon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp)

xdr_encode_unmon(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp)

{

	p = xdr_encode_common(rqstp, p, argp);

	if (IS_ERR(p))
@@ -202,7 +202,7 @@ xdr_encode_unmon(struct rpc_rqst *rqstp, u32 *p, struct nsm_args *argp) 
}



static int

xdr_decode_stat_res(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp)

xdr_decode_stat_res(struct rpc_rqst *rqstp, __be32 *p, struct nsm_res *resp)

{

	resp->status = ntohl(*p++);

	resp->state = ntohl(*p++);
@@ -212,7 +212,7 @@ xdr_decode_stat_res(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp) 
}



static int

xdr_decode_stat(struct rpc_rqst *rqstp, u32 *p, struct nsm_res *resp)

xdr_decode_stat(struct rpc_rqst *rqstp, __be32 *p, struct nsm_res *resp)

{

	resp->state = ntohl(*p++);

	return 0;

fs/lockd/svc4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ 
/*

 * Obtain client and file from arguments

 */

static u32

static __be32

nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,

			struct nlm_host **hostp, struct nlm_file **filp)

{

	struct nlm_host		*host = NULL;

	struct nlm_file		*file = NULL;

	struct nlm_lock		*lock = &argp->lock;

	u32			error = 0;

	__be32			error = 0;



	/* nfsd callbacks must have been installed for this procedure */

	if (!nlmsvc_ops)

fs/lockd/svclock.c

+5 −5
Original line number Diff line number Diff line
@@ -334,13 +334,13 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) 
 * Attempt to establish a lock, and if it can't be granted, block it

 * if required.

 */

u32

__be32

nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,

			struct nlm_lock *lock, int wait, struct nlm_cookie *cookie)

{

	struct nlm_block	*block, *newblock = NULL;

	int			error;

	u32			ret;

	__be32			ret;



	dprintk("lockd: nlmsvc_lock(%s/%ld, ty=%d, pi=%d, %Ld-%Ld, bl=%d)\n",

				file->f_file->f_dentry->d_inode->i_sb->s_id,
@@ -415,7 +415,7 @@ out: 
/*

 * Test for presence of a conflicting lock.

 */

u32

__be32

nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock,

				       struct nlm_lock *conflock)

{
@@ -448,7 +448,7 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, 
 * afterwards. In this case the block will still be there, and hence

 * must be removed.

 */

u32

__be32

nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock)

{

	int	error;
@@ -476,7 +476,7 @@ nlmsvc_unlock(struct nlm_file *file, struct nlm_lock *lock) 
 * be in progress.

 * The calling procedure must check whether the file can be closed.

 */

u32

__be32

nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)

{

	struct nlm_block	*block;

fs/lockd/svcproc.c

+4 −4
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#define NLMDBG_FACILITY		NLMDBG_CLIENT



#ifdef CONFIG_LOCKD_V4

static u32

cast_to_nlm(u32 status, u32 vers)

static __be32

cast_to_nlm(__be32 status, u32 vers)

{

	/* Note: status is assumed to be in network byte order !!! */

	if (vers != 4){
@@ -52,14 +52,14 @@ cast_to_nlm(u32 status, u32 vers) 
/*

 * Obtain client and file from arguments

 */

static u32

static __be32

nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,

			struct nlm_host **hostp, struct nlm_file **filp)

{

	struct nlm_host		*host = NULL;

	struct nlm_file		*file = NULL;

	struct nlm_lock		*lock = &argp->lock;

	u32			error = 0;

	__be32			error = 0;



	/* nfsd callbacks must have been installed for this procedure */

	if (!nlmsvc_ops)