Hi Pablo,
please consider the following IPVS updates for v3.14.
This pull-request consists of one change, the removal
of an unused variable by Geert Uytterhoeven.
The following changes since commit 6a649f339802f104549e1fb211e381036661e244:
netfilter: add IPv4/6 IPComp extension match support (2013-12-24 12:37:58 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.14
for you to fetch changes up to 9dcbe1b87c4a8e3ed62e95369c18709541a3dc8f:
ipvs: Remove unused variable ret from sync_thread_master() (2013-12-27 12:19:32 +0900)
----------------------------------------------------------------
IPVS Updates for v3.14
* Removal of unused variable by Geert Uytterhoeven
----------------------------------------------------------------
Geert Uytterhoeven (1):
ipvs: Remove unused variable ret from sync_thread_master()
net/netfilter/ipvs/ip_vs_sync.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
From: Geert Uytterhoeven <geert@linux-m68k.org>
net/netfilter/ipvs/ip_vs_sync.c: In function 'sync_thread_master':
net/netfilter/ipvs/ip_vs_sync.c:1640:8: warning: unused variable 'ret' [-Wunused-variable]
Commit 35a2af94c7ce7130ca292c68b1d27fcfdb648f6b ("sched/wait: Make the
__wait_event*() interface more friendly") changed how the interruption
state is returned. However, sync_thread_master() ignores this state,
now causing a compile warning.
According to Julian Anastasov [off-list ref], this behavior is OK:
"Yes, your patch looks ok to me. In the past we used ssleep() but IPVS
users were confused why IPVS threads increase the load average. So, we
switched to _interruptible calls and later the socket polling was
added."
Document this, as requested by Peter Zijlstra, to avoid precious developers
disappearing in this pitfall in the future.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_sync.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index f63c238..db80126 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1637,7 +1637,10 @@ static int sync_thread_master(void *data)
continue;
}
while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) {
- int ret = __wait_event_interruptible(*sk_sleep(sk),
+ /* (Ab)use interruptible sleep to avoid increasing
+ * the load avg.
+ */
+ __wait_event_interruptible(*sk_sleep(sk),
sock_writeable(sk) ||
kthread_should_stop());
if (unlikely(kthread_should_stop()))--
1.8.4
On Fri, Dec 27, 2013 at 12:46:11PM +0900, Simon Horman wrote:
Hi Pablo,
please consider the following IPVS updates for v3.14.
This pull-request consists of one change, the removal
of an unused variable by Geert Uytterhoeven.
The following changes since commit 6a649f339802f104549e1fb211e381036661e244:
netfilter: add IPv4/6 IPComp extension match support (2013-12-24 12:37:58 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs-for-v3.14
Also pulled, thanks Simon.