> On Mar 27, 2022, at 10:48 PM, Haowen Bai <baihaowen@xxxxxxxxx> wrote:
>
> Return boolean values ("true" or "false") instead of 1 or 0 from bool
> functions. This fixes the following warnings from coccicheck:
>
> ./fs/nfsd/nfs2acl.c:289:9-10: WARNING: return of 0/1 in function
> 'nfsaclsvc_encode_accessres' with return type bool
> ./fs/nfsd/nfs2acl.c:252:9-10: WARNING: return of 0/1 in function
> 'nfsaclsvc_encode_getaclres' with return type bool
>
> Signed-off-by: Haowen Bai <baihaowen@xxxxxxxxx>
> ---
> fs/nfsd/nfs2acl.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
Thank you, Haowen Bai. I've applied your patch to the for-rc
branch at
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
I thought I had a patch that converted the ACL XDR encoders to
return booleans, but it must have fallen through the cracks.
> diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
> index 367551b..b576080 100644
> --- a/fs/nfsd/nfs2acl.c
> +++ b/fs/nfsd/nfs2acl.c
> @@ -249,34 +249,34 @@ nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
> int w;
>
> if (!svcxdr_encode_stat(xdr, resp->status))
> - return 0;
> + return false;
>
> if (dentry == NULL || d_really_is_negative(dentry))
> - return 1;
> + return true;
> inode = d_inode(dentry);
>
> if (!svcxdr_encode_fattr(rqstp, xdr, &resp->fh, &resp->stat))
> - return 0;
> + return false;
> if (xdr_stream_encode_u32(xdr, resp->mask) < 0)
> - return 0;
> + return false;
>
> rqstp->rq_res.page_len = w = nfsacl_size(
> (resp->mask & NFS_ACL) ? resp->acl_access : NULL,
> (resp->mask & NFS_DFACL) ? resp->acl_default : NULL);
> while (w > 0) {
> if (!*(rqstp->rq_next_page++))
> - return 1;
> + return true;
> w -= PAGE_SIZE;
> }
>
> if (!nfs_stream_encode_acl(xdr, inode, resp->acl_access,
> resp->mask & NFS_ACL, 0))
> - return 0;
> + return false;
> if (!nfs_stream_encode_acl(xdr, inode, resp->acl_default,
> resp->mask & NFS_DFACL, NFS_ACL_DEFAULT))
> - return 0;
> + return false;
>
> - return 1;
> + return true;
> }
>
> /* ACCESS */
> @@ -286,17 +286,17 @@ nfsaclsvc_encode_accessres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
> struct nfsd3_accessres *resp = rqstp->rq_resp;
>
> if (!svcxdr_encode_stat(xdr, resp->status))
> - return 0;
> + return false;
> switch (resp->status) {
> case nfs_ok:
> if (!svcxdr_encode_fattr(rqstp, xdr, &resp->fh, &resp->stat))
> - return 0;
> + return false;
> if (xdr_stream_encode_u32(xdr, resp->access) < 0)
> - return 0;
> + return false;
> break;
> }
>
> - return 1;
> + return true;
> }
>
> /*
> --
> 2.7.4
>
--
Chuck Lever
