|
@@ -548,7 +548,6 @@ void ip_vs_conn_expire_now(struct ip_vs_conn *cp)
|
|
|
{
|
|
|
if (del_timer(&cp->timer))
|
|
|
mod_timer(&cp->timer, jiffies);
|
|
|
- __ip_vs_conn_put(cp);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -764,7 +763,6 @@ void ip_vs_random_dropentry(void)
|
|
|
{
|
|
|
int idx;
|
|
|
struct ip_vs_conn *cp;
|
|
|
- struct ip_vs_conn *ct;
|
|
|
|
|
|
/*
|
|
|
* Randomly scan 1/32 of the whole table every second
|
|
@@ -801,21 +799,12 @@ void ip_vs_random_dropentry(void)
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * Drop the entry, and drop its ct if not referenced
|
|
|
- */
|
|
|
- atomic_inc(&cp->refcnt);
|
|
|
- ct_write_unlock(hash);
|
|
|
-
|
|
|
- if ((ct = cp->control))
|
|
|
- atomic_inc(&ct->refcnt);
|
|
|
IP_VS_DBG(4, "del connection\n");
|
|
|
ip_vs_conn_expire_now(cp);
|
|
|
- if (ct) {
|
|
|
+ if (cp->control) {
|
|
|
IP_VS_DBG(4, "del conn template\n");
|
|
|
- ip_vs_conn_expire_now(ct);
|
|
|
+ ip_vs_conn_expire_now(cp->control);
|
|
|
}
|
|
|
- ct_write_lock(hash);
|
|
|
}
|
|
|
ct_write_unlock(hash);
|
|
|
}
|
|
@@ -829,7 +818,6 @@ static void ip_vs_conn_flush(void)
|
|
|
{
|
|
|
int idx;
|
|
|
struct ip_vs_conn *cp;
|
|
|
- struct ip_vs_conn *ct;
|
|
|
|
|
|
flush_again:
|
|
|
for (idx=0; idx<IP_VS_CONN_TAB_SIZE; idx++) {
|
|
@@ -839,18 +827,13 @@ static void ip_vs_conn_flush(void)
|
|
|
ct_write_lock_bh(idx);
|
|
|
|
|
|
list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) {
|
|
|
- atomic_inc(&cp->refcnt);
|
|
|
- ct_write_unlock(idx);
|
|
|
|
|
|
- if ((ct = cp->control))
|
|
|
- atomic_inc(&ct->refcnt);
|
|
|
IP_VS_DBG(4, "del connection\n");
|
|
|
ip_vs_conn_expire_now(cp);
|
|
|
- if (ct) {
|
|
|
+ if (cp->control) {
|
|
|
IP_VS_DBG(4, "del conn template\n");
|
|
|
- ip_vs_conn_expire_now(ct);
|
|
|
+ ip_vs_conn_expire_now(cp->control);
|
|
|
}
|
|
|
- ct_write_lock(idx);
|
|
|
}
|
|
|
ct_write_unlock_bh(idx);
|
|
|
}
|