Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9dcbe1b87c4a8e3ed62e95369c18709541a3dc8f

Authored by Geert Uytterhoeven
Committed by Simon Horman
1 parent 6a649f3398
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ipvs: Remove unused variable ret from sync_thread_master() 

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 <ja@ssi.bg>, 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>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

net/netfilter/ipvs/ip_vs_sync.c
Diff comments   View file @ 9dcbe1b
... ... @@ -1637,7 +1637,10 @@
1637 1637 continue;
1638 1638 }
1639 1639 while (ip_vs_send_sync_msg(tinfo->sock, sb->mesg) < 0) {
1640   - int ret = __wait_event_interruptible(*sk_sleep(sk),
  1640 + /* (Ab)use interruptible sleep to avoid increasing
  1641 + * the load avg.
  1642 + */
  1643 + __wait_event_interruptible(*sk_sleep(sk),
1641 1644 sock_writeable(sk) ||
1642 1645 kthread_should_stop());
1643 1646 if (unlikely(kthread_should_stop()))