lockd and nfsd endianness annotation fixes
Subsystems (2)
PATCH 1/1 lockd and nfsd endianness annotation fixes
--- fs/lockd/svclock.c | 6 +++--- fs/nfsd/nfs4xdr.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
fs/lockd/svclock.c +3 -3
@@ -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; }
fs/nfsd/nfs4xdr.c +1 -1
@@ -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 ;
Signature · 1 line
1.5.3.GIT
Quoted 1 line · Al Viro
Oops, thanks; these are my fault.
(How are you finding these? I was assuming sparse, but running a make -C2 just now I didn't see anything that would have suggested these fixes. I'm using whatever's current in Fedora--it says 0.3-1.fc7. Do I need something more recent?)
--b.
Quoted 53 lines
Signed-off-by Al Viro <[email protected]>--- fs/lockd/svclock.c | 6 +++--- fs/nfsd/nfs4xdr.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)fs/lockd/svclock.c +3
-3@@ -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; }fs/nfsd/nfs4xdr.c +1
-1@@ -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 ;Signature · 7 lines
1.5.3.GIT - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 9 lines · On Thursday July 26, [email protected] wrote:
Quoted 1 line · Al Viro
Oops, thanks; these are my fault.
(How are you finding these? I was assuming sparse, but running a make -C2 just now I didn't see anything that would have suggested these fixes. I'm using whatever's current in Fedora--it says 0.3-1.fc7. Do I need something more recent?)
I have a note about that somewhere.....
Quoted 8 lines
From: Al Viro <[email protected]>
Subject: Re: [PATCHSET] nfs endianness annotations
Date: Thu, 19 Oct 2006 02:26:00 +0100
....Folks, seriously, please run sparse after changes; it's a simple matter of make C=2 CF=-D__CHECK_ENDIAN__
fs/nfs*/; nothing tricky and it saves a lot of potential PITA...
And with lots of good intentions, I ran this about once, and promptly forgot.
Apologies.
NeilBrown
Quoted 18 lines · Neil Brown
Quoted 9 lines · On Thursday July 26, [email protected] wrote:
Quoted 1 line · Al Viro
Oops, thanks; these are my fault.
(How are you finding these? I was assuming sparse, but running a make -C2 just now I didn't see anything that would have suggested these fixes. I'm using whatever's current in Fedora--it says 0.3-1.fc7. Do I need something more recent?)
I have a note about that somewhere.....
Quoted 5 lines
From: Al Viro <[email protected]>
Subject: Re: [PATCHSET] nfs endianness annotations
Date: Thu, 19 Oct 2006 02:26:00 +0100
....
Quoted 6 lines
Quoted 3 lines
Folks, seriously, please run sparse after changes; it's a simple matter of make C=2 CF=-D__CHECK_ENDIAN__
fs/nfs*/; nothing tricky and it saves a lot of potential PITA...And with lots of good intentions, I ran this about once, and promptly forgot.
Thanks, uh, I probably saw that message too.
Hm, trying it just now--it catches the svclock.c mistake, but not the one in nfsd/nfs4xdr.c--at least not as far as I can tell.
--b.
Quoted 4 lines · J. Bruce Fields
Thanks, uh, I probably saw that message too.
Hm, trying it just now--it catches the
svclock.cmistake, but not the one in nfsd/nfs4xdr.c--at least not as far as I can tell.
fs/nfsd/nfs4xdr.c:2659:32: warning: incorrect type in argument 2 (different base types)fs/nfsd/nfs4xdr.c:2659:32: expected int [signed] nfserrfs/nfsd/nfs4xdr.c:2659:32: got restricted unsigned int [usertype] status
is what got triggered. I.e. call in
case OP_SECINFO:
nfsd4_encode_secinfo(resp, op->status, &op->u.secinfo);
break;which pointed to the misannotated function...