diff options
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_lblc.c | 6 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_lblcr.c | 8 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_sync.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index 0a64988fab08..ca7c79f71941 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c @@ -733,7 +733,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) /* if the conn entry hasn't lasted for 60 seconds, don't drop it. This will leave enough time for normal connection to get through. */ - if (cp->timeout+jiffies-cp->timer.expires < 60*HZ) + if (time_before(cp->timeout + jiffies, cp->timer.expires + 60*HZ)) return 0; /* Don't drop the entry if its number of incoming packets is not diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c index 4676cd915ecf..1fcc770b2a4a 100644 --- a/net/ipv4/ipvs/ip_vs_lblc.c +++ b/net/ipv4/ipvs/ip_vs_lblc.c @@ -295,8 +295,8 @@ static inline void ip_vs_lblc_full_check(struct ip_vs_lblc_table *tbl) write_lock(&tbl->lock); list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { - if ((now - en->lastuse) < - sysctl_ip_vs_lblc_expiration) + if (time_before(now, + en->lastuse + sysctl_ip_vs_lblc_expiration)) continue; ip_vs_lblc_free(en); @@ -350,7 +350,7 @@ static void ip_vs_lblc_check_expire(unsigned long data) write_lock(&tbl->lock); list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { - if ((now - en->lastuse) < ENTRY_TIMEOUT) + if (time_before(now, en->lastuse + ENTRY_TIMEOUT)) continue; ip_vs_lblc_free(en); diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c index 4e842198fd2a..f09cd84e75b0 100644 --- a/net/ipv4/ipvs/ip_vs_lblcr.c +++ b/net/ipv4/ipvs/ip_vs_lblcr.c @@ -481,10 +481,10 @@ static inline void ip_vs_lblcr_full_check(struct ip_vs_lblcr_table *tbl) write_lock(&tbl->lock); list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { - if ((now - en->lastuse) < - sysctl_ip_vs_lblcr_expiration) { + if (time_after(en->lastuse+sysctl_ip_vs_lblcr_expiration, + now)) continue; - } + ip_vs_lblcr_free(en); atomic_dec(&tbl->entries); } @@ -536,7 +536,7 @@ static void ip_vs_lblcr_check_expire(unsigned long data) write_lock(&tbl->lock); list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { - if ((now - en->lastuse) < ENTRY_TIMEOUT) + if (time_before(now, en->lastuse+ENTRY_TIMEOUT)) continue; ip_vs_lblcr_free(en); diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c index 02b7e01ba411..fcb7ec350a90 100644 --- a/net/ipv4/ipvs/ip_vs_sync.c +++ b/net/ipv4/ipvs/ip_vs_sync.c @@ -206,8 +206,8 @@ get_curr_sync_buff(unsigned long time) struct ip_vs_sync_buff *sb; spin_lock_bh(&curr_sb_lock); - if (curr_sb && - (jiffies - curr_sb->firstuse > time || time == 0)) { + if (curr_sb && (time == 0 || + time_before(jiffies - curr_sb->firstuse, time))) { sb = curr_sb; curr_sb = NULL; } else |