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

lockd and nfsd endianness annotation fixes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 582ee43d

fs/lockd/svclock.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -335,10 +335,10 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call) 
/*

/*

 * Deferred lock request handling for non-blocking lock

 * Deferred lock request handling for non-blocking lock

 */

 */

static u32

static __be32

nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block)

nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block)

{

{

	u32 status = nlm_lck_denied_nolocks;

	__be32 status = nlm_lck_denied_nolocks;





	block->b_flags |= B_QUEUED;

	block->b_flags |= B_QUEUED;
@@ -352,7 +352,7 @@ nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block) 
			status = nlm_drop_reply;

			status = nlm_drop_reply;

	}

	}

	dprintk("lockd: nlmsvc_defer_lock_rqst block %p flags %d status %d\n",

	dprintk("lockd: nlmsvc_defer_lock_rqst block %p flags %d status %d\n",

		block, block->b_flags, status);

		block, block->b_flags, ntohl(status));





	return status;

	return status;

}

}

fs/nfsd/nfs4xdr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2450,7 +2450,7 @@ nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_ 
}

}





static void

static void

nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, int nfserr,

nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr,

		     struct nfsd4_secinfo *secinfo)

		     struct nfsd4_secinfo *secinfo)

{

{

	int i = 0;

	int i = 0;