decnet: Use time_after_eq

PATCH Applied Himangi Saraogi 2 participants 2 messages Aug 20, 2014 – Aug 22, 2014

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Himangi Saraogi

author

2014-08-20 17:50 UTC #0 lore raw

PATCH 1/1 decnet: Use time_after_eq

The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.

A simplified version of the Coccinelle semantic patch making this change is as follows:

@change@
expression E1,E2;
@@
- (jiffies - E1) >= E2
+ time_after_eq(jiffies, E1+E2)

Signed-off-by Himangi Saraogi <[email protected]>

Acked-by Julia Lawall <[email protected]>

---
 net/decnet/dn_timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

net/decnet/dn_timer.c +2 -1

index d9c150c..1d330fd 100644
@@ -23,6 +23,7 @@
 #include <linux/spinlock.h>
 #include <net/sock.h>
 #include <linux/atomic.h>
+#include <linux/jiffies.h>
 #include <net/flow.h>
 #include <net/dn.h>

@@ -91,7 +92,7 @@ static void dn_slow_timer(unsigned long arg)
 	 * since the last successful transmission.
 	 */
 	if (scp->keepalive && scp->keepalive_fxn && (scp->state == DN_RUN)) {
-		if ((jiffies - scp->stamp) >= scp->keepalive)
+		if (time_after_eq(jiffies, scp->stamp + scp->keepalive))
 			scp->keepalive_fxn(sk);
 	}

Signature · 1 line

1.9.1

David Miller

maintainer Applied

2014-08-22 19:28 UTC #1 lore raw

From: Himangi Saraogi <[email protected]>
Date: Wed, 20 Aug 2014 23:20:09 +0530

Quoted 6 lines

The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values.
A simplified version of the Coccinelle semantic patch making this change is as follows:

Quoted 8 lines

@change@
expression E1,E2;
@@
- (jiffies - E1) >= E2
+ time_after_eq(jiffies, E1+E2)
Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>

Applied.