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

Commit 68888d10 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

IPVS: Make "no destination available" message more consistent between schedulers 



Acked-by: default avatarGraeme Fowler <graeme@graemef.net>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c8e95c02

net/netfilter/ipvs/ip_vs_lblc.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ ip_vs_lblc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
	/* No cache entry or it is invalid, time to schedule */

	dest = __ip_vs_lblc_schedule(svc);

	if (!dest) {

		IP_VS_DBG(1, "no destination available\n");

		IP_VS_ERR_RL("LBLC: no destination available\n");

		return NULL;

	}

net/netfilter/ipvs/ip_vs_lblcr.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ ip_vs_lblcr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		/* The cache entry is invalid, time to schedule */

		dest = __ip_vs_lblcr_schedule(svc);

		if (!dest) {

			IP_VS_DBG(1, "no destination available\n");

			IP_VS_ERR_RL("LBLCR: no destination available\n");

			read_unlock(&svc->sched_lock);

			return NULL;

		}

net/netfilter/ipvs/ip_vs_lc.c

+9 −5
Original line number Diff line number Diff line
@@ -66,9 +66,13 @@ ip_vs_lc_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		}

	}



	if (least)

	IP_VS_DBG_BUF(6, "LC: server %s:%u activeconns %d inactconns %d\n",

		      IP_VS_DBG_ADDR(svc->af, &least->addr), ntohs(least->port),

	if (!least)

		IP_VS_ERR_RL("LC: no destination available\n");

	else

		IP_VS_DBG_BUF(6, "LC: server %s:%u activeconns %d "

			      "inactconns %d\n",

			      IP_VS_DBG_ADDR(svc->af, &least->addr),

			      ntohs(least->port),

			      atomic_read(&least->activeconns),

			      atomic_read(&least->inactconns));

net/netfilter/ipvs/ip_vs_nq.c

+3 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		}

	}



	if (!least)

	if (!least) {

		IP_VS_ERR_RL("NQ: no destination available\n");

		return NULL;

	}



  out:

	IP_VS_DBG_BUF(6, "NQ: server %s:%u "

net/netfilter/ipvs/ip_vs_rr.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ ip_vs_rr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) 
		q = q->next;

	} while (q != p);

	write_unlock(&svc->sched_lock);

	IP_VS_ERR_RL("RR: no destination available\n");

	return NULL;



  out: