diff options
author | Himangi Saraogi <himangi774@gmail.com> | 2014-08-20 13:54:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-22 15:23:11 -0400 |
commit | c0b802367b05fa6342ab9ef07abdf446b9ba223f (patch) | |
tree | 942fee23ef183ff578a3a535780e9c2c8d005bf3 /net/decnet/af_decnet.c | |
parent | 8b1b1eb521004cec2518307c22dba8f4bff1c2bf (diff) |
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 <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/af_decnet.c')
-rw-r--r-- | net/decnet/af_decnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index ae011b46c071..25733d538147 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -127,6 +127,7 @@ Version 0.0.6 2.1.110 07-aug-98 Eduardo Marcelo Serrat | |||
127 | #include <linux/stat.h> | 127 | #include <linux/stat.h> |
128 | #include <linux/init.h> | 128 | #include <linux/init.h> |
129 | #include <linux/poll.h> | 129 | #include <linux/poll.h> |
130 | #include <linux/jiffies.h> | ||
130 | #include <net/net_namespace.h> | 131 | #include <net/net_namespace.h> |
131 | #include <net/neighbour.h> | 132 | #include <net/neighbour.h> |
132 | #include <net/dst.h> | 133 | #include <net/dst.h> |
@@ -598,7 +599,7 @@ int dn_destroy_timer(struct sock *sk) | |||
598 | if (sk->sk_socket) | 599 | if (sk->sk_socket) |
599 | return 0; | 600 | return 0; |
600 | 601 | ||
601 | if ((jiffies - scp->stamp) >= (HZ * decnet_time_wait)) { | 602 | if (time_after_eq(jiffies, scp->stamp + HZ * decnet_time_wait)) { |
602 | dn_unhash_sock(sk); | 603 | dn_unhash_sock(sk); |
603 | sock_put(sk); | 604 | sock_put(sk); |
604 | return 1; | 605 | return 1; |