Re: [Outreachy kernel] [PATCH v2 4/5] Staging: lustre: Use min or max instead of ternary operator

[Greg KH <gregkh@linuxfoundation.org>]

On Tue, Feb 23, 2016 at 09:17:19PM +0530, Bhumika Goyal wrote:
> Replace ternary operators with macros min/max as they are
> shorter and thus increases code readability. Macro min returns the
> minimum and max returns maximum of the two compared values.
> Made a semantic patch for changes:
> 
> @@
> type T;
> T x;
> T y;
> @@
> (
> - x < y ? x : y
> + min(x,y)
> |
> - x > y ? x : y
> + max(x,y)
> )
> 
> Signed-off-by: Bhumika Goyal <bhumirks@gmail.com>
> ---
> Changes in v2:
> Use min()/max() instead of min_t()/max_t() as the values passed in the
> macros are of same type.
> 
>  drivers/staging/lustre/lustre/include/lustre_disk.h | 6 ++----
>  drivers/staging/lustre/lustre/osc/osc_request.c     | 2 +-
>  drivers/staging/lustre/lustre/ptlrpc/events.c       | 2 +-
>  3 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/include/lustre_disk.h b/drivers/staging/lustre/lustre/include/lustre_disk.h
> index 7c6933f..8254428 100644
> --- a/drivers/staging/lustre/lustre/include/lustre_disk.h
> +++ b/drivers/staging/lustre/lustre/include/lustre_disk.h
> @@ -331,14 +331,12 @@ static inline void lcd_cpu_to_le(struct lsd_client_data *lcd,
>  
>  static inline __u64 lcd_last_transno(struct lsd_client_data *lcd)
>  {
> -	return (lcd->lcd_last_transno > lcd->lcd_last_close_transno ?
> -		lcd->lcd_last_transno : lcd->lcd_last_close_transno);
> +	return max(lcd->lcd_last_transno, lcd->lcd_last_close_transno);
>  }
>  
>  static inline __u64 lcd_last_xid(struct lsd_client_data *lcd)
>  {
> -	return (lcd->lcd_last_xid > lcd->lcd_last_close_xid ?
> -		lcd->lcd_last_xid : lcd->lcd_last_close_xid);
> +	return max(lcd->lcd_last_xid, lcd->lcd_last_close_xid);
>  }
>  
>  /****************** superblock additional info *********************/
> diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
> index 43b11c6..b48c23e 100644
> --- a/drivers/staging/lustre/lustre/osc/osc_request.c
> +++ b/drivers/staging/lustre/lustre/osc/osc_request.c
> @@ -1170,7 +1170,7 @@ static u32 osc_checksum_bulk(int nob, u32 pg_count,
>  	}
>  
>  	while (nob > 0 && pg_count > 0) {
> -		int count = pga[i]->count > nob ? nob : pga[i]->count;
> +		int count = min(nob, pga[i]->count);
>  
>  		/* corrupt the data before we compute the checksum, to
>  		 * simulate an OST->client data error */
> diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
> index 64eaa0e..dc2996f 100644
> --- a/drivers/staging/lustre/lustre/ptlrpc/events.c
> +++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
> @@ -254,7 +254,7 @@ static void ptlrpc_req_add_history(struct ptlrpc_service_part *svcpt,
>  
>  	new_seq = (sec << REQS_SEC_SHIFT) |
>  		  (usec << REQS_USEC_SHIFT) |
> -		  (svcpt->scp_cpt < 0 ? 0 : svcpt->scp_cpt);
> +		  (max(0, svcpt->scp_cpt));
>  
>  	if (new_seq > svcpt->scp_hist_seq) {
>  		/* This handles the initial case of scp_hist_seq == 0 or

Doesn't apply due to other changes in this code from other developers.
Please rebase and resend.

thanks,

greg k-h