Commit 5f7b839d authored by Haowen Bai's avatar Haowen Bai Committed by Chuck Lever
Browse files

SUNRPC: Return true/false (not 1/0) from bool functions 



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: default avatarHaowen Bai <baihaowen@meizu.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 4fc5f534

fs/nfsd/nfs2acl.c

+12 −12
Original line number Diff line number Diff line
@@ -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;

}



/*