Staging: Replace ternary operators with min_t/max_t

Replace ternary operators with macros min_t/max_t as they are shorter and thus increases code readability. Macro min_t return the minimum and min_t returns maximum of the two compared values.
Made a semantic patch for changes:

@@
type T;
T x;
T y;

@@
(
- x < y ? x : y
+ min_t(T,x,y)
|
- x > y ? x : y
+ max_t(T,x,y)
)

Signed-off-by Bhumika Goyal <[email protected]>

---
 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(-)

drivers/staging/lustre/lustre/include/lustre_disk.h +2 -4

index 7c6933f..c886f7c 100644
@@ -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_t(__u64, 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_t(__u64, lcd->lcd_last_xid, lcd->lcd_last_close_xid);
 }
 
 /****************** superblock additional info *********************/

drivers/staging/lustre/lustre/osc/osc_request.c +1 -1

index 43b11c6..065a915 100644
@@ -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_t(int, nob, pga[i]->count);
 
 		/* corrupt the data before we compute the checksum, to
 		 * simulate an OST->client data error */

drivers/staging/lustre/lustre/ptlrpc/events.c +1 -2

index 64eaa0e..3219fad 100644
@@ -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_t(int, 0, svcpt->scp_cpt));
 
 	if (new_seq > svcpt->scp_hist_seq) {
 		/* This handles the initial case of scp_hist_seq == 0 or
--

1.9.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/ae653a4fe839af60c62a545477d803c8b0866968.1456136671.git.bhumirks%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 5 lines · Bhumika Goyal

Replace ternary operators with macros min_t/max_t as they are shorter and thus increases code readability. Macro min_t return the minimum and min_t returns maximum of the two compared values.
Made a semantic patch for changes:

Quoted 4 lines

@@
type T;
T x;
T y;

Nice use of types.

julia

Quoted 73 lines

@@
(
- x < y ? x : y
+ min_t(T,x,y)
|
- x > y ? x : y
+ max_t(T,x,y)
)

Signed-off-by Bhumika Goyal <[email protected]>

---
 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(-)

drivers/staging/lustre/lustre/include/lustre_disk.h +2 -4

index 7c6933f..c886f7c 100644
@@ -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_t(__u64, 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_t(__u64, lcd->lcd_last_xid, lcd->lcd_last_close_xid);
 }
 
 /****************** superblock additional info *********************/

drivers/staging/lustre/lustre/osc/osc_request.c +1 -1

index 43b11c6..065a915 100644
@@ -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_t(int, nob, pga[i]->count);
 
              /* corrupt the data before we compute the checksum, to
               * simulate an OST->client data error */

drivers/staging/lustre/lustre/ptlrpc/events.c +1 -2

index 64eaa0e..3219fad 100644
@@ -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_t(int, 0, svcpt->scp_cpt));
 
      if (new_seq > svcpt->scp_hist_seq) {
              /* This handles the initial case of scp_hist_seq == 0 or
--

1.9.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/ae653a4fe839af60c62a545477d803c8b0866968.1456136671.git.bhumirks%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Replace ternary operators with macros min_t/max_t as they are shorter and thus increases code readability. Macro min_t return the minimum and min_t returns maximum of the two compared values.
Made a semantic patch for changes:

@@
type T;
T x;
T y;
@@
(
- x < y ? x : y
+ min_t(T,x,y)
|
- x > y ? x : y
+ max_t(T,x,y)
)

Quoted 5 lines · Bhumika Goyal

Replace ternary operators with macros min_t/max_t as they are shorter and thus increases code readability. Macro min_t return the minimum and min_t returns maximum of the two compared values.
Made a semantic patch for changes:

Quoted 12 lines

@@
type T;
T x;
T y;
@@
(
- x < y ? x : y
+ min_t(T,x,y)
|
- x > y ? x : y
+ max_t(T,x,y)
)

If they are the same type, why can't you just use min() and max()? The call to min_t() and max_t() seem a bit of an overkill as they do an explicit cast for when the types of the two variables are not the same type.

So I'd prefer this patch to just be min() and max() if at all possible.

thanks,

greg k-h

This patchset replaces ternary operators with macros min_t/max_t as they are shorter and thus increases code readability. Macro min_t return the minimum and min_t returns maximum of the two compared values. Made a semantic patch for changes:

@@
type T;
T x;
T y;
@@
(
- x < y ? x : y
+ min_t(T,x,y)
|
- x > y ? x : y
+ max_t(T,x,y)
)