mirror of https://gitee.com/openkylin/linux.git
lockd and nfsd endianness annotation fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
582ee43dad
commit
ca5c8cde93
|
@ -335,10 +335,10 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call)
|
|||
/*
|
||||
* Deferred lock request handling for non-blocking lock
|
||||
*/
|
||||
static u32
|
||||
static __be32
|
||||
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;
|
||||
|
||||
|
@ -352,7 +352,7 @@ nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block)
|
|||
status = nlm_drop_reply;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -2450,7 +2450,7 @@ nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
|
|||
}
|
||||
|
||||
static void
|
||||
nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, int nfserr,
|
||||
nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
|
||||
struct nfsd4_secinfo *secinfo)
|
||||
{
|
||||
int i = 0;
|
||||
|
|
Loading…
Reference in New Issue