This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / ipvs / ip_vs_ctl.c

diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index 47388b2..d90a793 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -75,7 +75,6 @@ static int sysctl_ip_vs_amemthresh = 1024;
 static int sysctl_ip_vs_am_droprate = 10;
 int sysctl_ip_vs_cache_bypass = 0;
 int sysctl_ip_vs_expire_nodest_conn = 0;
-int sysctl_ip_vs_expire_quiescent_template = 0;
 int sysctl_ip_vs_sync_threshold[2] = { 3, 50 };
 int sysctl_ip_vs_nat_icmp_send = 0;
 
@@ -747,8 +746,8 @@ ip_vs_new_dest(struct ip_vs_service *svc, struct ip_vs_dest_user *udest,
        atomic_set(&dest->refcnt, 0);
 
        INIT_LIST_HEAD(&dest->d_list);
-       spin_lock_init(&dest->dst_lock);
-       spin_lock_init(&dest->stats.lock);
+       dest->dst_lock = SPIN_LOCK_UNLOCKED;
+       dest->stats.lock = SPIN_LOCK_UNLOCKED;
        __ip_vs_update_dest(svc, dest, udest);
        ip_vs_new_estimator(&dest->stats);
 
@@ -1063,8 +1062,8 @@ ip_vs_add_service(struct ip_vs_service_user *u, struct ip_vs_service **svc_p)
        svc->netmask = u->netmask;
 
        INIT_LIST_HEAD(&svc->destinations);
-       rwlock_init(&svc->sched_lock);
-       spin_lock_init(&svc->stats.lock);
+       svc->sched_lock = RW_LOCK_UNLOCKED;
+       svc->stats.lock = SPIN_LOCK_UNLOCKED;
 
        /* Bind the scheduler */
        ret = ip_vs_bind_scheduler(svc, sched);
@@ -1448,9 +1447,9 @@ static struct ctl_table vs_vars[] = {
        {
                .ctl_name       = NET_IPV4_VS_TO_ES,
                .procname       = "timeout_established",
-               .data   = &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED],
+               .data   = &vs_timeout_table_dos.timeout[IP_VS_S_ESTABLISHED],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1458,7 +1457,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_synsent",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_SENT],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1466,7 +1465,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_synrecv",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_SYN_RECV],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1474,7 +1473,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_finwait",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_FIN_WAIT],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1490,7 +1489,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_close",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1498,7 +1497,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_closewait",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_CLOSE_WAIT],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1506,7 +1505,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_lastack",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_LAST_ACK],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1514,7 +1513,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_listen",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_LISTEN],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1522,7 +1521,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_synack",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_SYNACK],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1530,7 +1529,7 @@ static struct ctl_table vs_vars[] = {
                .procname       = "timeout_udp",
                .data   = &vs_timeout_table_dos.timeout[IP_VS_S_UDP],
                .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .mode           = 0644, 
                .proc_handler   = &proc_dointvec_jiffies,
        },
        {
@@ -1558,14 +1557,6 @@ static struct ctl_table vs_vars[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
        },
-       {
-               .ctl_name       = NET_IPV4_VS_EXPIRE_QUIESCENT_TEMPLATE,
-               .procname       = "expire_quiescent_template",
-               .data           = &sysctl_ip_vs_expire_quiescent_template,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
-       },
        {
                .ctl_name       = NET_IPV4_VS_SYNC_THRESHOLD,
                .procname       = "sync_threshold",
@@ -2366,7 +2357,7 @@ int ip_vs_control_init(void)
        }
 
        memset(&ip_vs_stats, 0, sizeof(ip_vs_stats));
-       spin_lock_init(&ip_vs_stats.lock);
+       ip_vs_stats.lock = SPIN_LOCK_UNLOCKED;
        ip_vs_new_estimator(&ip_vs_stats);
 
        /* Hook the defense timer */