[PATCH 11/25] staging: lustre: libcfs: invert error handling for cfs_cpt_table_print

Dan Carpenter dan.carpenter at oracle.com
Tue Apr 17 07:14:49 UTC 2018


On Mon, Apr 16, 2018 at 12:09:53AM -0400, James Simmons wrote:
> From: Amir Shehata <amir.shehata at intel.com>
> 
> Instead of setting rc to -EFBIG for several cases in the loop lets
> initialize rc to -EFBIG and just break out of the loop in case of
> failure. Just set rc to zero once we successfully finish the loop.
> 
> Signed-off-by: Amir Shehata <amir.shehata at intel.com>
> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7734
> Reviewed-on: http://review.whamcloud.com/18916
> Reviewed-by: Olaf Weber <olaf at sgi.com>
> Reviewed-by: Doug Oucharek <dougso at me.com>
> Signed-off-by: James Simmons <jsimmons at infradead.org>
> ---
>  .../staging/lustre/lnet/libcfs/linux/linux-cpu.c   | 22 ++++++++++------------
>  1 file changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
> index bbf89b8..6d8dcd3 100644
> --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
> +++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
> @@ -158,29 +158,26 @@ struct cfs_cpt_table *
>  cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
>  {
>  	char *tmp = buf;
> -	int rc = 0;
> +	int rc = -EFBIG;
>  	int i;
>  	int j;
>  
>  	for (i = 0; i < cptab->ctb_nparts; i++) {
> -		if (len > 0) {
> -			rc = snprintf(tmp, len, "%d\t:", i);
> -			len -= rc;
> -		}
> +		if (len <= 0)
> +			goto out;
> +
> +		rc = snprintf(tmp, len, "%d\t:", i);
> +		len -= rc;
>  
> -		if (len <= 0) {
> -			rc = -EFBIG;
> +		if (len <= 0)
>  			goto out;

This patch says it's a cleanup but the only thing it does is introduce
"forgot to set the error" bugs.

regards,
dan carpenter



More information about the devel mailing list