summaryrefslogtreecommitdiff
path: root/fs/lockd
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-26 17:33:49 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 11:11:56 -0700
commitca5c8cde93d65db3139604ca6b91bf8ff3f775e2 (patch)
treed9ce882caf6b2b1d578829481e0895d6cd5b02aa /fs/lockd
parent582ee43dad8e411513a74f2d801255dcffc6d29e (diff)
downloadlinux-3.10-ca5c8cde93d65db3139604ca6b91bf8ff3f775e2.tar.gz
linux-3.10-ca5c8cde93d65db3139604ca6b91bf8ff3f775e2.tar.bz2
linux-3.10-ca5c8cde93d65db3139604ca6b91bf8ff3f775e2.zip
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/lockd')
-rw-r--r--fs/lockd/svclock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index b3efa4536cc..a21e4bc5444 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -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;
}