Commit bd144550 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller

IPVS: convert __ip_vs_sched_lock to a spinlock

Also rename __ip_vs_sched_lock to ip_vs_sched_lock.
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8870f842
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
static LIST_HEAD(ip_vs_schedulers); static LIST_HEAD(ip_vs_schedulers);
/* lock for service table */ /* lock for service table */
static DEFINE_RWLOCK(__ip_vs_sched_lock); static DEFINE_SPINLOCK(ip_vs_sched_lock);
/* /*
...@@ -108,7 +108,7 @@ static struct ip_vs_scheduler *ip_vs_sched_getbyname(const char *sched_name) ...@@ -108,7 +108,7 @@ static struct ip_vs_scheduler *ip_vs_sched_getbyname(const char *sched_name)
IP_VS_DBG(2, "%s(): sched_name \"%s\"\n", __func__, sched_name); IP_VS_DBG(2, "%s(): sched_name \"%s\"\n", __func__, sched_name);
read_lock_bh(&__ip_vs_sched_lock); spin_lock_bh(&ip_vs_sched_lock);
list_for_each_entry(sched, &ip_vs_schedulers, n_list) { list_for_each_entry(sched, &ip_vs_schedulers, n_list) {
/* /*
...@@ -122,14 +122,14 @@ static struct ip_vs_scheduler *ip_vs_sched_getbyname(const char *sched_name) ...@@ -122,14 +122,14 @@ static struct ip_vs_scheduler *ip_vs_sched_getbyname(const char *sched_name)
} }
if (strcmp(sched_name, sched->name)==0) { if (strcmp(sched_name, sched->name)==0) {
/* HIT */ /* HIT */
read_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
return sched; return sched;
} }
if (sched->module) if (sched->module)
module_put(sched->module); module_put(sched->module);
} }
read_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
return NULL; return NULL;
} }
...@@ -184,10 +184,10 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) ...@@ -184,10 +184,10 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler)
/* increase the module use count */ /* increase the module use count */
ip_vs_use_count_inc(); ip_vs_use_count_inc();
write_lock_bh(&__ip_vs_sched_lock); spin_lock_bh(&ip_vs_sched_lock);
if (!list_empty(&scheduler->n_list)) { if (!list_empty(&scheduler->n_list)) {
write_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
ip_vs_use_count_dec(); ip_vs_use_count_dec();
pr_err("%s(): [%s] scheduler already linked\n", pr_err("%s(): [%s] scheduler already linked\n",
__func__, scheduler->name); __func__, scheduler->name);
...@@ -200,7 +200,7 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) ...@@ -200,7 +200,7 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler)
*/ */
list_for_each_entry(sched, &ip_vs_schedulers, n_list) { list_for_each_entry(sched, &ip_vs_schedulers, n_list) {
if (strcmp(scheduler->name, sched->name) == 0) { if (strcmp(scheduler->name, sched->name) == 0) {
write_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
ip_vs_use_count_dec(); ip_vs_use_count_dec();
pr_err("%s(): [%s] scheduler already existed " pr_err("%s(): [%s] scheduler already existed "
"in the system\n", __func__, scheduler->name); "in the system\n", __func__, scheduler->name);
...@@ -211,7 +211,7 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) ...@@ -211,7 +211,7 @@ int register_ip_vs_scheduler(struct ip_vs_scheduler *scheduler)
* Add it into the d-linked scheduler list * Add it into the d-linked scheduler list
*/ */
list_add(&scheduler->n_list, &ip_vs_schedulers); list_add(&scheduler->n_list, &ip_vs_schedulers);
write_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
pr_info("[%s] scheduler registered.\n", scheduler->name); pr_info("[%s] scheduler registered.\n", scheduler->name);
...@@ -229,9 +229,9 @@ int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) ...@@ -229,9 +229,9 @@ int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler)
return -EINVAL; return -EINVAL;
} }
write_lock_bh(&__ip_vs_sched_lock); spin_lock_bh(&ip_vs_sched_lock);
if (list_empty(&scheduler->n_list)) { if (list_empty(&scheduler->n_list)) {
write_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
pr_err("%s(): [%s] scheduler is not in the list. failed\n", pr_err("%s(): [%s] scheduler is not in the list. failed\n",
__func__, scheduler->name); __func__, scheduler->name);
return -EINVAL; return -EINVAL;
...@@ -241,7 +241,7 @@ int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler) ...@@ -241,7 +241,7 @@ int unregister_ip_vs_scheduler(struct ip_vs_scheduler *scheduler)
* Remove it from the d-linked scheduler list * Remove it from the d-linked scheduler list
*/ */
list_del(&scheduler->n_list); list_del(&scheduler->n_list);
write_unlock_bh(&__ip_vs_sched_lock); spin_unlock_bh(&ip_vs_sched_lock);
/* decrease the module use count */ /* decrease the module use count */
ip_vs_use_count_dec(); ip_vs_use_count_dec();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment