Skip to contentSkip to conversation

af_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
#0 lore raw

PATCH 1/1 af_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,E3;
@@
- jiffies - E1 >= (E2*E3)
+ time_after_eq(jiffies, E1+E2*E3)

Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>
---
 net/decnet/af_decnet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/decnet/af_decnet.c +2 -1
index ae011b4..25733d5 100644
@@ -127,6 +127,7 @@ Version 0.0.6    2.1.110   07-aug-98   Eduardo Marcelo Serrat
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <linux/jiffies.h>
 #include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>

@@ -598,7 +599,7 @@ int dn_destroy_timer(struct sock *sk)
 	if (sk->sk_socket)
 		return 0;
 
-	if ((jiffies - scp->stamp) >= (HZ * decnet_time_wait)) {
+	if (time_after_eq(jiffies, scp->stamp + HZ * decnet_time_wait)) {
 		dn_unhash_sock(sk);
 		sock_put(sk);
 		return 1;
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw

From: Himangi Saraogi <[email protected]>
Date: Wed, 20 Aug 2014 23:24:40 +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,E3;
@@
- jiffies - E1 >= (E2*E3)
+ time_after_eq(jiffies, E1+E2*E3)

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

Applied.