aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-26 12:33:49 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 14:11:56 -0400
commitca5c8cde93d65db3139604ca6b91bf8ff3f775e2 (patch)
treed9ce882caf6b2b1d578829481e0895d6cd5b02aa /fs
parent582ee43dad8e411513a74f2d801255dcffc6d29e (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/lockd/svclock.c6
-rw-r--r--fs/nfsd/nfs4xdr.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index b3efa4536cc5..a21e4bc5444b 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -335,10 +335,10 @@ static void nlmsvc_freegrantargs(struct nlm_rqst *call)
335/* 335/*
336 * Deferred lock request handling for non-blocking lock 336 * Deferred lock request handling for non-blocking lock
337 */ 337 */
338static u32 338static __be32
339nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block) 339nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block)
340{ 340{
341 u32 status = nlm_lck_denied_nolocks; 341 __be32 status = nlm_lck_denied_nolocks;
342 342
343 block->b_flags |= B_QUEUED; 343 block->b_flags |= B_QUEUED;
344 344
@@ -352,7 +352,7 @@ nlmsvc_defer_lock_rqst(struct svc_rqst *rqstp, struct nlm_block *block)
352 status = nlm_drop_reply; 352 status = nlm_drop_reply;
353 } 353 }
354 dprintk("lockd: nlmsvc_defer_lock_rqst block %p flags %d status %d\n", 354 dprintk("lockd: nlmsvc_defer_lock_rqst block %p flags %d status %d\n",
355 block, block->b_flags, status); 355 block, block->b_flags, ntohl(status));
356 356
357 return status; 357 return status;
358} 358}
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index b3d55c6747fd..8ef0964179bc 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2450,7 +2450,7 @@ nfsd4_encode_rename(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
2450} 2450}
2451 2451
2452static void 2452static void
2453nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, int nfserr, 2453nfsd4_encode_secinfo(struct nfsd4_compoundres *resp, __be32 nfserr,
2454 struct nfsd4_secinfo *secinfo) 2454 struct nfsd4_secinfo *secinfo)
2455{ 2455{
2456 int i = 0; 2456 int i = 0;