Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f72816e authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

IPVS: convert __ip_vs_securetcp_lock to a spinlock 



Also rename __ip_vs_securetcp_lock to ip_vs_securetcp_lock.

Spinlock conversion was suggested by Eric Dumazet.

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 bd144550

net/netfilter/ipvs/ip_vs_ctl.c

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static DEFINE_RWLOCK(__ip_vs_svc_lock); 
static DEFINE_RWLOCK(__ip_vs_rs_lock);



/* lock for state and timeout tables */

static DEFINE_RWLOCK(__ip_vs_securetcp_lock);

static DEFINE_SPINLOCK(ip_vs_securetcp_lock);



/* lock for drop entry handling */

static DEFINE_SPINLOCK(__ip_vs_dropentry_lock);
@@ -204,7 +204,7 @@ static void update_defense_level(void) 
	spin_unlock(&__ip_vs_droppacket_lock);



	/* secure_tcp */

	write_lock(&__ip_vs_securetcp_lock);

	spin_lock(&ip_vs_securetcp_lock);

	switch (sysctl_ip_vs_secure_tcp) {

	case 0:

		if (old_secure_tcp >= 2)
@@ -238,7 +238,7 @@ static void update_defense_level(void) 
	old_secure_tcp = sysctl_ip_vs_secure_tcp;

	if (to_change >= 0)

		ip_vs_protocol_timeout_change(sysctl_ip_vs_secure_tcp>1);

	write_unlock(&__ip_vs_securetcp_lock);

	spin_unlock(&ip_vs_securetcp_lock);



	local_bh_enable();

}