leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFSD: Correct type annotations in user xattr helpers

Browse Source 
Squelch some sparse warnings:

/home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13: warning: incorrect type in assignment (different base types)
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13:    expected int err
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2264:13:    got restricted __be32
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24: warning: incorrect type in return expression (different base types)
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24:    expected restricted __be32
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2266:24:    got int err
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13: warning: incorrect type in assignment (different base types)
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13:    expected int err
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2288:13:    got restricted __be32
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24: warning: incorrect type in return expression (different base types)
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24:    expected restricted __be32
/home/cel/src/linux/linux/fs/nfsd/vfs.c:2290:24:    got int err

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Chuck Lever 2020-09-11 14:47:48 -04:00 committed by J. Bruce Fields
parent 403217f304
commit 8237284a00
1 changed files with 4 additions and 2 deletions

6
fs/nfsd/vfs.c
View File

@ -2259,7 +2259,8 @@ out:
__be32 __be32
nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name) nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name)
{ {
int err, ret; __be32 err;
int ret;
err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE); err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE);
if (err) if (err)
@ -2283,7 +2284,8 @@ __be32
nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name, nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name,
void *buf, u32 len, u32 flags) void *buf, u32 len, u32 flags)
{ {
int err, ret; __be32 err;
int ret;
err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE); err = fh_verify(rqstp, fhp, 0, NFSD_MAY_WRITE);
if (err) if (err)