mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Via Simon Horman: ==================== * Whitespace cleanup spotted by checkpatch.pl from Tingwei Liu. * Section conflict cleanup, basically removal of one wrong __read_mostly, from Andi Kleen. ==================== Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
commit
52af2bfcc0
2 changed files with 7 additions and 8 deletions
|
@ -3580,7 +3580,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info)
|
|||
}
|
||||
|
||||
|
||||
static const struct genl_ops ip_vs_genl_ops[] __read_mostly = {
|
||||
static const struct genl_ops ip_vs_genl_ops[] = {
|
||||
{
|
||||
.cmd = IPVS_CMD_NEW_SERVICE,
|
||||
.flags = GENL_ADMIN_PERM,
|
||||
|
|
|
@ -238,7 +238,7 @@ static void ip_vs_lblc_flush(struct ip_vs_service *svc)
|
|||
|
||||
spin_lock_bh(&svc->sched_lock);
|
||||
tbl->dead = 1;
|
||||
for (i=0; i<IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
for (i = 0; i < IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
hlist_for_each_entry_safe(en, next, &tbl->bucket[i], list) {
|
||||
ip_vs_lblc_del(en);
|
||||
atomic_dec(&tbl->entries);
|
||||
|
@ -265,7 +265,7 @@ static inline void ip_vs_lblc_full_check(struct ip_vs_service *svc)
|
|||
unsigned long now = jiffies;
|
||||
int i, j;
|
||||
|
||||
for (i=0, j=tbl->rover; i<IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
for (i = 0, j = tbl->rover; i < IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
j = (j + 1) & IP_VS_LBLC_TAB_MASK;
|
||||
|
||||
spin_lock(&svc->sched_lock);
|
||||
|
@ -321,7 +321,7 @@ static void ip_vs_lblc_check_expire(unsigned long data)
|
|||
if (goal > tbl->max_size/2)
|
||||
goal = tbl->max_size/2;
|
||||
|
||||
for (i=0, j=tbl->rover; i<IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
for (i = 0, j = tbl->rover; i < IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
j = (j + 1) & IP_VS_LBLC_TAB_MASK;
|
||||
|
||||
spin_lock(&svc->sched_lock);
|
||||
|
@ -340,7 +340,7 @@ static void ip_vs_lblc_check_expire(unsigned long data)
|
|||
tbl->rover = j;
|
||||
|
||||
out:
|
||||
mod_timer(&tbl->periodic_timer, jiffies+CHECK_EXPIRE_INTERVAL);
|
||||
mod_timer(&tbl->periodic_timer, jiffies + CHECK_EXPIRE_INTERVAL);
|
||||
}
|
||||
|
||||
|
||||
|
@ -363,7 +363,7 @@ static int ip_vs_lblc_init_svc(struct ip_vs_service *svc)
|
|||
/*
|
||||
* Initialize the hash buckets
|
||||
*/
|
||||
for (i=0; i<IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
for (i = 0; i < IP_VS_LBLC_TAB_SIZE; i++) {
|
||||
INIT_HLIST_HEAD(&tbl->bucket[i]);
|
||||
}
|
||||
tbl->max_size = IP_VS_LBLC_TAB_SIZE*16;
|
||||
|
@ -536,8 +536,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb,
|
|||
/*
|
||||
* IPVS LBLC Scheduler structure
|
||||
*/
|
||||
static struct ip_vs_scheduler ip_vs_lblc_scheduler =
|
||||
{
|
||||
static struct ip_vs_scheduler ip_vs_lblc_scheduler = {
|
||||
.name = "lblc",
|
||||
.refcnt = ATOMIC_INIT(0),
|
||||
.module = THIS_MODULE,
|
||||
|
|
Loading…
Reference in a new issue